Merge branch 'master' into add_kubeadm_to_tools

2017-01-26 14:04:51 -08:00
parent f3aef1dbf2 f7104ba2e1
commit dcb247860c
2560 changed files with 396003 additions and 2529 deletions
@@ -16,8 +16,7 @@ toc:
  
 - title: Third-Party Tools
  section:
+  - docs/tools/kompose/index.md
+  - docs/tools/kompose/user-guide.md
  - title: Helm
    path: https://github.com/kubernetes/helm
-  - title: Kompose
-    path: https://github.com/kubernetes-incubator/kompose
-