Merge branch 'master' into release-1.8

2017-09-20 11:21:34 -07:00
parent 2bd62e674b b2c715d3bf
commit b052e4e803
18 changed files with 680 additions and 40 deletions
@@ -399,7 +399,7 @@ three replicas.

 ```shell
 kubectl patch sts web -p '{"spec":{"replicas":3}}'
-"web" patched
+statefulset "web" patched
 ```

 Wait for `web-4` and `web-3` to transition to Terminating.