Fix for some style issues. Review: https://reviews.apache.org/r/24773
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/65083fb0 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/65083fb0 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/65083fb0 Branch: refs/heads/master Commit: 65083fb05267b3cf54941c5f2e63e535090fcbc9 Parents: 66aebe2 Author: Timothy Chen <[email protected]> Authored: Sat Aug 16 11:38:43 2014 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Sat Aug 16 11:47:46 2014 -0700 ---------------------------------------------------------------------- src/slave/containerizer/docker.cpp | 2 +- src/tests/docker_containerizer_tests.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/65083fb0/src/slave/containerizer/docker.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index 215c2b4..b1b9e9f 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -494,7 +494,7 @@ Future<Nothing> DockerContainerizerProcess::_pull( CHECK_SOME(s.err()); return io::read(s.err().get()) .then(defer(self(), &Self::__pull, s, lambda::_1)); - } +} Future<Nothing> DockerContainerizerProcess::__pull( http://git-wip-us.apache.org/repos/asf/mesos/blob/65083fb0/src/tests/docker_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/docker_containerizer_tests.cpp b/src/tests/docker_containerizer_tests.cpp index 8ead090..8654f9c 100644 --- a/src/tests/docker_containerizer_tests.cpp +++ b/src/tests/docker_containerizer_tests.cpp @@ -1466,7 +1466,8 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_SlaveRecoveryTaskContainer) // parse and can even properly use for sending other messages, but the // current implementation of 'UPID::operator bool ()' fails if the IP // component of a PID is '0'. -TEST_F(DockerContainerizerTest, DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContainer) +TEST_F(DockerContainerizerTest, + DISABLED_ROOT_DOCKER_SlaveRecoveryExecutorContainer) { Try<PID<Master> > master = StartMaster(); ASSERT_SOME(master);
