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
..
concepts.yml	Custom resource docs	2017-06-27 10:27:51 -07:00
docs-home.yml	Update links to proper repos	2017-06-28 22:08:36 -07:00
globals.yml	Make a Setup section. (#3227)	2017-04-07 13:46:56 -07:00
overrides.yml	Update imported docs (#2947)	2017-03-22 10:10:36 -07:00
reference.yml	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7	2017-06-28 22:29:21 -07:00
search.yml	Fix PR #3274 (#3276)	2017-04-07 15:38:50 -07:00
setup.yml	rename kargo to kubespray in getting started docs (#4119)	2017-06-22 14:56:19 -07:00
tasks.yml	Encrypting secrets at rest and cluster security guide	2017-06-27 15:41:39 -04:00
tools.yml	Merge branch 'master' into add_kubeadm_to_tools	2017-01-26 14:04:51 -08:00
tutorials.yml	/docs/samples revamp: move examples to /tutorials	2017-06-26 11:22:35 -07:00