Merge branch 'master' into inline-titles

This commit is contained in:
Ben Balter
2016-12-19 18:46:34 -05:00
21 changed files with 289 additions and 729 deletions
@@ -71,12 +71,6 @@ Guide to running a single master, multi-worker cluster controlled by an OS X men
<hr/>
[**Resizable multi-node cluster on Azure with Weave**](/docs/getting-started-guides/coreos/azure/)
Guide to running an HA etcd cluster with a single master on Azure. Uses the Azure node.js CLI to resize the cluster.
<hr/>
[**Multi-node cluster using cloud-config, CoreOS and VMware ESXi**](https://github.com/xavierbaude/VMware-coreos-multi-nodes-Kubernetes)
Configure a single master, single worker cluster on VMware ESXi.