Merge branch 'master' into edit-docs

2016-11-04 14:27:13 -07:00
parent cefceda95f 05ffedcebd
commit b043672f59
1 changed files with 1 additions and 1 deletions
@@ -3,7 +3,7 @@ kind: Pod
 metadata:
  name: nginx
  annotations:
-    pod.alpha.kubernetes.io/init-containers: '[
+    pod.beta.kubernetes.io/init-containers: '[
        {
            "name": "install",
            "image": "busybox",