Andrew Chen b3ac35430c Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: Create hyperlink Add files via upload Fix typo Remove from TOC/Search: pods/init-containers ... (#2694) Add files via upload fix to taint the master node Move Guide topics: Container Lifestyle Hooks, Images, Volumes Correct ASM logo filename fixed ASM blurb Repair Spotinst logo Remove redundant section in deployments # Conflicts: # docs/getting-started-guides/kubeadm.md # docs/user-guide/volumes.md		2017-03-21 15:54:35 -07:00
..
working-with-objects	Move Guide topic: Parallel Processing using Expansions (#2867)	2017-03-16 11:31:57 -07:00
components.md	Update components.md	2017-03-21 11:49:23 -07:00
kubernetes-api.md	Move Kubernetes API page. (#2849)	2017-03-15 17:07:34 -07:00
what-is-kubernetes.md	Move Guide topics: Container Lifestyle Hooks, Images, Volumes	2017-03-20 15:35:51 -07:00