Merge branch 'master' into fix-typo

This commit is contained in:
Peter Lee
2016-12-13 22:46:24 +08:00
committed by GitHub
89 changed files with 4965 additions and 685 deletions
+2
View File
@@ -356,3 +356,5 @@ for more information.
- [Docs for the DNS cluster addon](http://releases.k8s.io/{{page.githubbranch}}/build-tools/kube-dns/README.md)
## What's next
- [Autoscaling the DNS Service in a Cluster](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/).