Merge pull request #20063 from mqliang/imageGC-config

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-17 06:16:45 -08:00
8 changed files with 810 additions and 741 deletions

View File

@@ -230,6 +230,7 @@ min-pr-number
min-request-timeout
min-resync-period
minimum-container-ttl-duration
minimum-image-ttl-duration
minion-max-log-age
minion-max-log-backups
minion-max-log-size