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
+2 -1
View File
@@ -105,8 +105,9 @@ toc:
path: https://cloud.google.com/container-engine/docs/before-you-begin/
- docs/getting-started-guides/gce.md
- docs/getting-started-guides/aws.md
- title: Running Kubernetes on Azure Container Service
path: https://docs.microsoft.com/en-us/azure/container-service/container-service-kubernetes-walkthrough
- docs/getting-started-guides/azure.md
- docs/getting-started-guides/coreos/azure/index.md
- docs/getting-started-guides/clc.md
- title: Running Kubernetes on IBM SoftLayer
path: https://github.com/patrocinio/kubernetes-softlayer