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
@@ -1,4 +1,4 @@
-approvers:
+reviewers:
 - janetkuo
 - mikedanese

@@ -1,5 +1,5 @@
 ---
-approvers:
+reviewers:
 - mikedanese
 title: Rolling Update Demo
 ---
@@ -18,7 +18,7 @@ limitations under the License.
 <head>
  <script src="angular.min.js"></script>
  <script src="script.js"></script>
-  <link rel="stylesheet" href="style.css"></link>
+  <link rel="stylesheet" href="style.css">
 </head>
 <body ng-controller="ButtonsCtrl">
  <div ng-repeat="server in servers" class="pod">