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
..
independent	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7	2017-06-28 22:29:21 -07:00
index.md	Remove duplicate redirect. (#3613)	2017-05-02 18:34:32 -07:00
pick-right-solution.md	Update links to proper repos	2017-06-28 22:08:36 -07:00