whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

Browse Source 
* '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
This commit is contained in:
Andrew Chen
2017-03-21 15:54:35 -07:00
parent f9c06f48e2 296750f249
commit b3ac35430c
41 changed files with 1073 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tasks/administer-cluster/overview.md
+1 -1
View File
@@ -70,7 +70,7 @@ project](/docs/admin/salt).
## Security
* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/docs/user-guide/container-environment)):
* **Kubernetes Container Environment** ([docs/user-guide/container-environment.md](/docs/concepts/containers/container-lifecycle-hooks/)):
Describes the environment for Kubelet managed containers on a Kubernetes
node.