> On Oct. 15, 2014, 10:47 p.m., Mesos ReviewBot wrote: > > Bad patch! > > > > Reviews applied: [26736] > > > > Failed command: git apply --index 26736.patch > > > > Error: > > error: patch failed: src/docker/docker.cpp:472 > > error: src/docker/docker.cpp: patch does not apply > > error: patch failed: src/slave/containerizer/docker.cpp:684 > > error: src/slave/containerizer/docker.cpp: patch does not apply > > error: patch failed: src/slave/flags.hpp:300 > > error: src/slave/flags.hpp: patch does not apply > > Ankur Chauhan wrote: > @Ryan Thomas - do you know what reviewbot is complaining about?
Most likely need to rebase on latest master. Ryan can you rebase? - Timothy ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/26736/#review56833 ----------------------------------------------------------- On Oct. 15, 2014, 8:30 p.m., Ryan Thomas wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/26736/ > ----------------------------------------------------------- > > (Updated Oct. 15, 2014, 8:30 p.m.) > > > Review request for mesos. > > > Bugs: MESOS-1925 > https://issues.apache.org/jira/browse/MESOS-1925 > > > Repository: mesos-git > > > Description > ------- > > Ensure docker calls stop if a docker_stop_timeout is provided Added the flag > docker_stop_timeout that defaults to 0, if the timeout is 0 the a docker kill > will be run, otherwise a docker stop with the timeout in seconds is used. A > negative value will result in a Failure. > > > Diffs > ----- > > src/docker/docker.cpp e09b51c4f5101c3a8e77caf12b208c88f47fbcb2 > src/slave/containerizer/docker.cpp 9a2948951f57f3ab16291df51cd9f33e5e96add4 > src/slave/flags.hpp 16f0cc2ab5ba16a39499608174278b3082e0585d > > Diff: https://reviews.apache.org/r/26736/diff/ > > > Testing > ------- > > make check > sudo bin/mesos-tests.sh --gtest_filter="DOCKER" --verbose > support/mesos-style.py > > > Thanks, > > Ryan Thomas > >
