Andrew Chen 996723bc8f Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: Replace the tab with 4 spaces in md files (#2797) fix link error Replace the tab with 4 spaces in html files hitting the `ClusterIP` from a pod (#2826) # Conflicts: # docs/admin/accessing-the-api.md # docs/api-reference/extensions/v1beta1/definitions.html # docs/getting-started-guides/kubeadm.md # docs/user-guide/kubectl/index.md		2017-03-23 00:19:33 -07:00
..
v1.5	Replace the tab with 4 spaces in md files (#2797)	2017-03-23 00:10:00 -07:00
v1.6	kubectl 1.6 reference docs	2017-03-16 13:11:42 -07:00
.files_generated	Refdocs for 1.2 import	2016-03-07 16:51:25 +00:00
index.md	Replace the tab with 4 spaces in md files (#2797)	2017-03-23 00:10:00 -07:00