Merge pull request #12470 from simon3z/add-host-ipc

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-09-21 09:15:01 -07:00
22 changed files with 107 additions and 19 deletions

View File

@@ -107,6 +107,7 @@ deployment-controller-sync-period
hostname-override
host-network-sources
host-pid-sources
host-ipc-sources
http-check-frequency
http-port
ignore-not-found