You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/09/01 08:35:05 UTC
mesos git commit: Fixed style issues in docker commit.
Repository: mesos
Updated Branches:
refs/heads/master 9d8829182 -> 3e7758c8b
Fixed style issues in docker commit.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3e7758c8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3e7758c8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3e7758c8
Branch: refs/heads/master
Commit: 3e7758c8b28a8ecae2f9aa00ef27b17773ef4c61
Parents: 9d88291
Author: Timothy Chen <tn...@apache.org>
Authored: Mon Aug 31 23:19:54 2015 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Mon Aug 31 23:21:04 2015 -0700
----------------------------------------------------------------------
src/docker/docker.hpp | 1 -
src/tests/containerizer/docker_containerizer_tests.cpp | 2 +-
src/tests/hook_tests.cpp | 2 +-
src/tests/mesos.hpp | 5 ++++-
4 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3e7758c8/src/docker/docker.hpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.hpp b/src/docker/docker.hpp
index 4df57bc..aaf8884 100644
--- a/src/docker/docker.hpp
+++ b/src/docker/docker.hpp
@@ -250,7 +250,6 @@ private:
const std::string path;
const std::string socket;
-
};
#endif // __DOCKER_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/3e7758c8/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 2c43a3a..a628922 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -171,7 +171,7 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch_Executor)
ASSERT_SOME(master);
MockDocker* mockDocker =
- new MockDocker(tests::flags.docker, tests::flags.docker_socket);
+ new MockDocker(tests::flags.docker, tests::flags.docker_socket);
Shared<Docker> docker(mockDocker);
http://git-wip-us.apache.org/repos/asf/mesos/blob/3e7758c8/src/tests/hook_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hook_tests.cpp b/src/tests/hook_tests.cpp
index 5ecb031..deb4343 100644
--- a/src/tests/hook_tests.cpp
+++ b/src/tests/hook_tests.cpp
@@ -528,7 +528,7 @@ TEST_F(HookTest, ROOT_DOCKER_VerifySlavePreLaunchDockerHook)
ASSERT_SOME(master);
MockDocker* mockDocker =
- new MockDocker(tests::flags.docker, tests::flags.docker_socket);
+ new MockDocker(tests::flags.docker, tests::flags.docker_socket);
Shared<Docker> docker(mockDocker);
slave::Flags flags = CreateSlaveFlags();
http://git-wip-us.apache.org/repos/asf/mesos/blob/3e7758c8/src/tests/mesos.hpp
----------------------------------------------------------------------
diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp
index 8435109..906948d 100644
--- a/src/tests/mesos.hpp
+++ b/src/tests/mesos.hpp
@@ -967,7 +967,10 @@ public:
class MockDocker : public Docker
{
public:
- MockDocker(const std::string& path, const std::string &socket) : Docker(path, socket)
+ MockDocker(
+ const std::string& path,
+ const std::string &socket)
+ : Docker(path, socket)
{
EXPECT_CALL(*this, pull(_, _, _))
.WillRepeatedly(Invoke(this, &MockDocker::_pull));