Merge pull request #25726 from jszczepkowski/hpa-testfix

Automatic merge from submit-queue

Rework of resource consumer.
This commit is contained in:
k8s-merge-robot
2016-06-01 08:50:23 -07:00
8 changed files with 429 additions and 136 deletions

View File

@@ -70,6 +70,9 @@ configure-cbr0
configure-cloud-routes
conntrack-max
conntrack-tcp-timeout-established
consumer-port
consumer-service-name
consumer-service-namespace
contain-pod-resources
container-port
container-runtime
@@ -463,3 +466,4 @@ watch-only
whitelist-override-label
windows-line-endings
www-prefix