Merge pull request #16111 from mesosphere/sttts-sandbox-overlay

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-03 03:00:57 -08:00
8 changed files with 86 additions and 20 deletions

View File

@@ -179,10 +179,11 @@ mesos-authentication-secret-file
mesos-cgroup-prefix
mesos-executor-cpus
mesos-executor-mem
mesos-launch-grace-period
mesos-master
mesos-role
mesos-sandbox-overlay
mesos-user
mesos-launch-grace-period
minimum-container-ttl-duration
minion-max-log-age
minion-max-log-backups
@@ -314,4 +315,3 @@ terminated-pod-gc-threshold
reconcile-cidr
register-schedulable
repair-malformed-updates