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
@@ -38,7 +38,7 @@ title: Overview
      </div>
    </div>

-    <div class="content__modules">
+    <div id="basics-modules" class="content__modules">
      <h2>Kubernetes Basics Modules</h2>
      <div class="row">
        <div class="col-md-12">