Merge pull request #16269 from gmarek/delete-namespace

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-29 02:34:31 -07:00
11 changed files with 53 additions and 107 deletions

View File

@@ -59,6 +59,7 @@ cpu-percent
default-container-cpu-limit
default-container-mem-limit
delay-shutdown
delete-namespace
deleting-pods-burst
deleting-pods-qps
deployment-label-key