Merge branch 'master' into release-1.8

2017-09-22 12:57:53 -07:00
parent 96a4aa7a3e 8f9677227d
commit 29a7b6df2e
17 changed files with 481 additions and 72 deletions
@@ -442,7 +442,7 @@ that are considered invalid environment variable names will have those keys
 skipped.  The pod will be allowed to start.  There will be an event whose
 reason is `InvalidVariableNames` and the message will contain the list of
 invalid keys that were skipped. The example shows a pod which refers to the
-default/mysecret ConfigMap that contains 2 invalid keys, 1badkey and 2alsobad.
+default/mysecret that contains 2 invalid keys, 1badkey and 2alsobad.

 ```shell
 $ kubectl get events