Andrew Chen 9886f27a2e Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6 ... * 'master' of https://github.com/kubernetes/kubernetes.github.io: (62 commits) Move Guide topic: Admin Guide Move Guide topic: Resource Monitoring. (#2895) Move Guide topic: Service. (#2891) Move Guide topic: Connecting Apps with Services. (#2885) Move Guide topic: Federation Service Discovery. (#2884) Move Guide topic: Config Provider Firewalls. (#2883) Move Guide topic: Kubeconfig File Move Accessing Clusters topic to Concepts. (#2875) Move Guide topic: Sharing Clusters Move Guide topic: Prereqs Move Garbage Collection topic. (#2874) Move PetSets topic. (#2873) Move Guide topic: Pod Templates (#2872) Move StatefulSets topic. (#2869) Rename /docs/tasks/job/work-queue-1/ Move Guide topic: Fine Parallel Processing using a Work Queue (#2870) Move Guide topic: Coarse Parallel Processing Using a Work Queue Move Init Containers topic. (#2866) Move Guide topic: Parallel Processing using Expansions (#2867) Move Pod overview. (#2865) ... # Conflicts: # docs/api.md # docs/user-guide/jobs.md		2017-03-17 17:33:48 -07:00
..
centos	Provide correct location for KUBE_ETCD_SERVERS	2017-02-25 16:12:07 -05:00
coreos	Merge branch 'master' into inline-titles	2016-12-19 18:46:34 -05:00
docker-multinode	Removed non-org members from OWNERS.	2016-08-03 01:31:31 -07:00
fedora	fix typos	2016-12-28 17:48:46 +08:00
mesos	fix broken links	2017-01-18 14:03:34 -08:00
network-policy	fix unsupported parameter of wget command	2017-03-06 11:09:20 -08:00
rkt	Remove lavalamp from docs he doesn't know anything about	2017-01-09 15:14:38 -08:00
ubuntu	Update local instructions to new method.	2017-03-06 10:48:39 -08:00
windows	fix space problems which ide results in	2016-12-22 20:28:51 +08:00
OWNERS	Removed non-org members from OWNERS.	2016-08-03 01:31:31 -07:00
alternatives.md	add explicit titles to docs	2016-12-15 15:16:54 -05:00
aws.md	Move Guide topic: Kubeconfig File	2017-03-16 15:42:11 -07:00
azure.md	Merge branch 'master' into inline-titles	2016-12-19 18:46:34 -05:00
binary_release.md	Fixed broken link to build directory	2017-02-01 11:11:48 -08:00
clc.md	fix typos	2016-12-28 17:48:46 +08:00
cloudstack.md	Remove lavalamp from docs he doesn't know anything about	2017-01-09 15:14:38 -08:00
dcos.md	fix broken link	2017-01-18 12:57:01 +08:00
docker-multinode.md	add explicit titles to docs	2016-12-15 15:16:54 -05:00
docker.md	Update docker.md	2017-01-10 13:41:30 -08:00
fluentd-gcp.yaml	Run update-imported-docs.sh	2016-12-13 13:44:13 -08:00
gce.md	fix the command output	2017-02-28 09:50:58 -08:00
index.md	getting-started-guides: add CoreOS Tectonic	2017-03-02 09:47:54 -08:00
kargo.md	Fix the tool link for Kargo docs	2017-01-25 10:23:53 -08:00
kops.md	Some spelling errors in /docs/	2016-12-23 16:45:56 +08:00
kubeadm.md	add required images in kubeadm init step	2017-03-03 00:09:39 -08:00
libvirt-coreos.md	Merge branch 'fix-typos' into master	2016-12-24 12:52:36 +08:00
meanstack.md	fix space problems which ide results in	2016-12-22 20:28:51 +08:00
mesos-docker.md	add explicit titles to docs	2016-12-15 15:16:54 -05:00
minikube.md	Update minikube.md	2017-02-06 13:48:57 -08:00
openstack-heat.md	#2534 mark openstack-heat as standalone-salt-conf	2017-02-15 14:15:01 -08:00
ovirt.md	add explicit titles to docs	2016-12-15 15:16:54 -05:00
photon-controller.md	Some spelling errors in /docs/	2016-12-23 16:45:56 +08:00
rackspace.md	fix a series errors of using "a" and "an"	2016-12-22 16:56:12 +08:00
scratch.md	Move Guide topic: Kubeconfig File	2017-03-16 15:42:11 -07:00
stackpoint.md	Added missing titles to Minikube tutorial and Stackpoint GS guide.	2017-01-09 16:36:13 -08:00
vsphere.md	Add default storage class documentation for 1.6	2017-02-22 17:20:12 -08:00