Merge branch 'master' into bcamp

Conflicts: _layouts/docwithnav.html
2016-09-18 19:21:59 -07:00
parent 33ce1f605c e53cf66b4e
commit 05dbc740e1
11 changed files with 99 additions and 224 deletions
@@ -161,6 +161,8 @@ toc:
      path: /docs/getting-started-guides/azure/
    - title: Running Kubernetes on CenturyLink Cloud
      path: /docs/getting-started-guides/clc/
+    - title: Running Kubernetes on IBM SoftLayer
+      path: https://github.com/patrocinio/kubernetes-softlayer
  - title: Running Kubernetes on Custom Solutions
    section:
    - title: Creating a Custom Cluster from Scratch