Merge pull request #12960 from smarterclayton/network_tester

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-20 22:44:30 -07:00
4 changed files with 89 additions and 4 deletions

View File

@@ -51,6 +51,7 @@ current-release-pr
current-replicas
default-container-cpu-limit
default-container-mem-limit
delay-shutdown
deleting-pods-burst
deleting-pods-qps
deployment-label-key