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
parent ce8507c515 9ce54855d5
commit 996723bc8f
104 changed files with 9776 additions and 3212 deletions
@@ -71,7 +71,7 @@ Sample Config:
        working-dir = <Folder in which VMs are provisioned, can be null>
        vm-uuid = <VM Instance UUID of virtual machine which can be retrieved from instanceUuid property in VmConfigInfo, or also set as vc.uuid in VMX file. If empty, will be retrieved from sysfs (requires root)>
 [Disk]
-	scsicontrollertype = pvscsi
+    scsicontrollertype = pvscsi
 ```

 * Set the cloud provider via ```--cloud-provider=vsphere``` flag for each instance of kubelet, apiserver and controller manager.