> 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? > > Timothy Chen wrote: > Most likely need to rebase on latest master. Ryan can you rebase? > > Ryan Thomas wrote: > I think it is due to how I updated the review, should I just open a new > one with the commits squashed? > > Timothy Chen wrote: > I just tried to apply this review myself on latest master and it's failed > to merge clealy, so it's definitely just not rebased on latest master.
Ok, rebasing. - Ryan ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/26736/#review56833 ----------------------------------------------------------- On Oct. 17, 2014, 9:55 p.m., Ryan Thomas wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/26736/ > ----------------------------------------------------------- > > (Updated Oct. 17, 2014, 9:55 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.hpp 9656f15547a522f9866c28c78d431508771c795a > src/docker/docker.cpp e09b51c4f5101c3a8e77caf12b208c88f47fbcb2 > src/slave/containerizer/docker.cpp 9a2948951f57f3ab16291df51cd9f33e5e96add4 > src/slave/flags.hpp 03c62a2fd040768392c7e24d93f64ca3a855c4a1 > src/tests/docker_containerizer_tests.cpp > 67d60a885d65edbcbbf702bce83a54d1a5c0411f > src/tests/docker_tests.cpp 04139af2c377226554d53e9dbce93868da1dc1ba > > 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 > >
