Merge remote-tracking branch 'origin' into release-1.4

2016-09-23 16:57:30 -07:00
parent a926c3959e 51add3e397
commit f4457ae677
21 changed files with 155 additions and 43 deletions
@@ -49,7 +49,7 @@ kubectl version

 ### SEE ALSO

-* [kubectl](kubectl.md)	 - kubectl controls the Kubernetes cluster manager
+* [kubectl](../kubectl.md)	 - kubectl controls the Kubernetes cluster manager

 ###### Auto generated by spf13/cobra on 2-Sep-2016