Merge pull request #11955 from pedro-r-marques/flag_resolv_conf

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-30 21:03:54 -07:00
5 changed files with 111 additions and 16 deletions

View File

@@ -206,6 +206,7 @@ reject-paths
repo-root
report-dir
required-contexts
resolv-conf
resource-container
resource-quota-sync-period
resource-version