Andrew Chen b40d09fe77 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: Update links to proper repos # Conflicts: # docs/admin/kubeadm.md # docs/concepts/overview/kubernetes-api.md # docs/reference/api-overview.md # docs/setup/independent/create-cluster-kubeadm.md # docs/tasks/administer-cluster/configure-pod-disruption-budget.md		2017-06-28 22:29:21 -07:00
..
controllers	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7	2017-06-28 22:29:21 -07:00
pods	Patch PR #4140 (#4215)	2017-06-27 21:42:07 -07:00