merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
@@ -0,0 +1,21 @@
+---
+title: Overview of Kubernetes Online Training
+---
+
+{% capture overview %}
+
+Here are some of the sites that offer online training for Kubernetes:
+
+{% endcapture %}
+
+{% capture body %}
+
+* [Scalable Microservices with Kubernetes (Udacity)](https://www.udacity.com/course/scalable-microservices-with-kubernetes--ud615)
+
+* [Introduction to Kubernetes (edX)](https://www.edx.org/course/introduction-kubernetes-linuxfoundationx-lfs158x)
+
+{% endcapture %}
+
+
+{% include templates/concept.md %}
+