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
..
concepts.yml	Move Guide topics: Container Lifestyle Hooks, Images, Volumes	2017-03-20 15:35:51 -07:00
docs-home.yml	use in-page titles to generate sidebar nav	2016-12-19 15:08:54 -05:00
globals.yml	WIP: New Docs Landing Page and ToC Organization. (#1468)	2016-11-03 15:06:08 -07:00
guides.yml	Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6	2017-03-21 15:54:35 -07:00
overrides.yml	Bump update-imported-docs.sh to 1.5, and remove files deleted in 1.5	2016-12-13 13:42:50 -08:00
reference.yml	Merge pull request #2887 from pwittrock/release-1.6	2017-03-21 11:38:53 -07:00
samples.yml	Bump links in navigation from 1.3 to 1.5	2017-01-17 17:00:43 -08:00
support.yml	Update headings and guidance about headings.	2017-01-19 14:37:45 -08:00
tasks.yml	Merge pull request #2878 from janetkuo/ds-rolling-update	2017-03-21 11:09:45 -07:00
tools.yml	Merge branch 'master' into add_kubeadm_to_tools	2017-01-26 14:04:51 -08:00
tutorials.yml	Move Guide topic: Replication Controller Operations	2017-03-15 16:04:32 -07:00