Merge pull request #15735 from mesosphere/jdef-fix-tasks-and-profiling

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-17 02:20:18 -07:00
22 changed files with 34700 additions and 3181 deletions

View File

@@ -30,6 +30,7 @@ mesosslave:
hostname: mesosslave
privileged: true
image: mesosphere/mesos-slave-dind:mesos-0.24.0_dind-0.2_docker-1.8.2_ubuntu-14.04.3
ports: [ "10248","10249" ]
entrypoint:
- bash
- -xc
@@ -147,6 +148,8 @@ scheduler:
--cluster-domain=cluster.local
--mesos-executor-cpus=1.0
--v=4
--executor-logv=4
--profiling=true
environment:
- MESOS_DOCKER_ETCD_TIMEOUT
- MESOS_DOCKER_MESOS_TIMEOUT