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
..
backups.md	Update backups.md	2017-03-02 10:34:18 -08:00
calico.md	Replace the tab with 4 spaces in md files (#2797)	2017-03-23 00:10:00 -07:00
decommissioning.md	Spell fixes	2017-03-02 10:34:18 -08:00
glossary.md	Spell fixes	2017-03-02 10:34:18 -08:00
index.md	Update ubuntu install instructions.	2017-03-06 10:48:39 -08:00
installation.md	Switch to proxy subresource	2017-03-22 16:00:30 -04:00
local.md	Update local instructions to new method.	2017-03-06 10:48:39 -08:00
logging.md	modified: docs/getting-started-guides/ubuntu/index.md	2017-01-31 10:39:00 -08:00
manual.md	Restructure the Ubuntu Getting Started Section.	2017-01-10 17:48:19 -05:00
monitoring.md	Spell fixes	2017-03-02 10:34:18 -08:00
networking.md	Spell fixes	2017-03-02 10:34:18 -08:00
operational-considerations.md	Replace the tab with 4 spaces in md files (#2797)	2017-03-23 00:10:00 -07:00
scaling.md	Fix titles.	2017-01-10 20:55:43 -05:00
security.md	Fix titles.	2017-01-10 20:55:43 -05:00
storage.md	Spell fixes	2017-03-02 10:34:18 -08:00
troubleshooting.md	Spell fixes	2017-03-02 10:34:18 -08:00
upgrades.md	Restructure the Ubuntu Getting Started Section.	2017-01-10 17:48:19 -05:00
validation.md	Update validation.md	2017-03-02 10:34:18 -08:00