Andrew Chen 4eba51d6f2 Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: Fix incorrect sentence (#2876) fixing typo fix typo Update kubeadm.md # Conflicts: # docs/getting-started-guides/kubeadm.md		2017-03-21 19:30:14 -07:00
..
abstractions	Move Garbage Collection topic. (#2874)	2017-03-16 13:58:07 -07:00
cluster-administration	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6	2017-03-21 19:30:14 -07:00
configuration	Move init containers to stable in v1.6 (#1939)	2017-03-21 18:13:33 -07:00
containers	Move Guide topics: Container Lifestyle Hooks, Images, Volumes	2017-03-20 15:35:51 -07:00
jobs	Rename /docs/tasks/job/work-queue-1/	2017-03-16 12:56:44 -07:00
overview	Merge branches 'release-1.6' and 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6	2017-03-21 19:04:37 -07:00
policy	Quota2 (#2838)	2017-03-15 11:27:58 -07:00
services-networking	Apply changes from PR #2787	2017-03-21 19:02:30 -07:00
storage	Move Guide topics: Container Lifestyle Hooks, Images, Volumes	2017-03-20 15:35:51 -07:00
workloads	Move init containers to stable in v1.6 (#1939)	2017-03-21 18:13:33 -07:00
index.md	Fix typo	2017-03-21 21:17:35 +01:00