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

..

admin

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

api-reference

Update Deployment group from "extensions" to "apps"

2017-03-16 20:14:35 -07:00

concepts

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

2017-03-21 19:30:14 -07:00

contribute

Update review-issues.md

2017-02-23 15:30:47 +08:00

federation/api-reference

fix some wrong links

2017-02-23 16:08:38 +08:00

getting-started-guides

Update kubeadm.md

2017-03-21 19:07:36 -07:00

resources-reference

Update Deployment group from "extensions" to "apps"

2017-03-16 20:14:35 -07:00

tasks

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

2017-03-21 19:30:14 -07:00

tools

update index.md (#2755)

2017-03-21 18:29:21 -07:00

tutorials

Move init containers to stable in v1.6 (#1939)

2017-03-21 18:13:33 -07:00

user-guide

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

2017-03-21 19:30:14 -07:00

api.md

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

2017-03-20 13:53:52 -07:00

deprecation-policy.md

fix typo

2017-02-23 15:30:47 +08:00

index.md

Update kubeadm guide and reference pages for 1.6

2017-03-19 10:04:17 -07:00

reference.md

Use {{page.version}} instead of hard-coded release number

2017-01-17 17:00:43 -08:00

reporting-security-issues.md

…

samples.md

…

search.md

…

sitemap.md

…

troubleshooting.md

…

whatisk8s.md

Move What is Kubernetes topic. (#2851)

2017-03-15 17:21:06 -07:00