Merge branch 'master' into getting-started

2017-02-01 14:05:49 -08:00
parent a32a2a59c2 a4f3a25f54
commit af5cc6a17f
8 changed files with 1284 additions and 19 deletions
@@ -33,7 +33,7 @@ cd kubernetes
 make release
 ```

-For more details on the release process see the [`build-tools/`](http://releases.k8s.io/{{page.githubbranch}}/build-tools/) directory
+For more details on the release process see the [`build`](http://releases.k8s.io/{{page.githubbranch}}/build/) directory

 ### Download Kubernetes and automatically set up a default cluster