Merge pull request #19696 from mesosphere/jdef_mesos_pod_discovery

Auto commit by PR queue bot
2016-01-28 01:15:40 -08:00
parent 458eb5284a 1748f028d5
commit d3fdc61ff7
5 changed files with 112 additions and 50 deletions
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -212,6 +212,7 @@ mesos-default-pod-roles
 mesos-executor-cpus
 mesos-executor-mem
 mesos-framework-roles
+mesos-generate-task-discovery
 mesos-launch-grace-period
 mesos-master
 mesos-sandbox-overlay