Merge remote-tracking branch 'origin' into release-1.4

2016-09-08 16:39:34 -07:00
parent 290e4f12a4 165aed599e
commit 502c2fe184
7 changed files with 163 additions and 17 deletions
@@ -460,7 +460,7 @@ within AWS Certificate Manager.
    "metadata": {
        "name": "my-service",
        "annotations": {
-            "service.beta.kubernetes.io/aws-load-balancer-backend-protocol=": "(https|http|ssl|tcp)"
+            "service.beta.kubernetes.io/aws-load-balancer-backend-protocol": "(https|http|ssl|tcp)"
        }
    },
 ```