You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2015/12/21 18:18:07 UTC
[1/2] mesos git commit: Removed extra ';
' after inline class function definitions.
Repository: mesos
Updated Branches:
refs/heads/master 3c95c9b9c -> c4c2ac80b
Removed extra ';' after inline class function definitions.
Review: https://reviews.apache.org/r/41608/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/affd722f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/affd722f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/affd722f
Branch: refs/heads/master
Commit: affd722fee6fd679ff365bf84c2af735146dbf1a
Parents: 3c95c9b
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Dec 21 11:51:43 2015 -0500
Committer: Michael Park <mp...@apache.org>
Committed: Mon Dec 21 11:51:43 2015 -0500
----------------------------------------------------------------------
include/mesos/hook.hpp | 2 +-
src/docker/docker.hpp | 2 +-
src/slave/containerizer/mesos/isolators/network/port_mapping.hpp | 2 +-
src/tests/containerizer/memory_test_helper.hpp | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/affd722f/include/mesos/hook.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/hook.hpp b/include/mesos/hook.hpp
index 9b20ac7..87e01a9 100644
--- a/include/mesos/hook.hpp
+++ b/include/mesos/hook.hpp
@@ -34,7 +34,7 @@ namespace mesos {
class Hook
{
public:
- virtual ~Hook() {};
+ virtual ~Hook() {}
// This label decorator hook is called from within master during
// the launchTask routine. A module implementing the hook creates
http://git-wip-us.apache.org/repos/asf/mesos/blob/affd722f/src/docker/docker.hpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.hpp b/src/docker/docker.hpp
index 4cb7a4e..c769372 100644
--- a/src/docker/docker.hpp
+++ b/src/docker/docker.hpp
@@ -169,7 +169,7 @@ protected:
// Uses the specified path to the Docker CLI tool.
Docker(const std::string& _path,
const std::string& _socket)
- : path(_path), socket("unix://" + _socket) {};
+ : path(_path), socket("unix://" + _socket) {}
private:
static process::Future<Nothing> _run(
http://git-wip-us.apache.org/repos/asf/mesos/blob/affd722f/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
index cbb9407..e3766c3 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.hpp
@@ -87,7 +87,7 @@ public:
const IntervalSet<uint16_t>& total,
size_t _portsPerContainer)
: free(total),
- portsPerContainer_(_portsPerContainer) {};
+ portsPerContainer_(_portsPerContainer) {}
// Returns the number of ephemeral ports for each container.
size_t portsPerContainer() const { return portsPerContainer_; }
http://git-wip-us.apache.org/repos/asf/mesos/blob/affd722f/src/tests/containerizer/memory_test_helper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/memory_test_helper.hpp b/src/tests/containerizer/memory_test_helper.hpp
index 2d91e33..86a9b57 100644
--- a/src/tests/containerizer/memory_test_helper.hpp
+++ b/src/tests/containerizer/memory_test_helper.hpp
@@ -34,7 +34,7 @@ namespace tests {
class MemoryTestHelper
{
public:
- MemoryTestHelper() {};
+ MemoryTestHelper() {}
~MemoryTestHelper();
// Spawns a subprocess.
@@ -74,7 +74,7 @@ class MemoryTestHelperMain : public Subcommand
public:
static const char NAME[];
- MemoryTestHelperMain() : Subcommand(NAME) {};
+ MemoryTestHelperMain() : Subcommand(NAME) {}
protected:
virtual int execute();
[2/2] mesos git commit: Cleaned up formatting for multiple
inheritance.
Posted by mp...@apache.org.
Cleaned up formatting for multiple inheritance.
Review: https://reviews.apache.org/r/41609/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c4c2ac80
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c4c2ac80
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c4c2ac80
Branch: refs/heads/master
Commit: c4c2ac80b9b8ba5b636e8b733528b3e6241196ed
Parents: affd722
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Mon Dec 21 11:52:32 2015 -0500
Committer: Michael Park <mp...@apache.org>
Committed: Mon Dec 21 11:52:32 2015 -0500
----------------------------------------------------------------------
src/tests/containerizer/provisioner_docker_tests.cpp | 3 +--
src/tests/hierarchical_allocator_tests.cpp | 3 +--
src/tests/registrar_tests.cpp | 6 +++---
3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c4c2ac80/src/tests/containerizer/provisioner_docker_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp
index 7c1197e..bb142f5 100644
--- a/src/tests/containerizer/provisioner_docker_tests.cpp
+++ b/src/tests/containerizer/provisioner_docker_tests.cpp
@@ -185,8 +185,7 @@ protected:
/**
* Fixture for testing TokenManager component.
*/
-class RegistryTokenTest : public TokenHelper, public ::testing::Test
-{};
+class RegistryTokenTest : public TokenHelper, public ::testing::Test {};
// Tests JSON Web Token parsing for a valid token string.
http://git-wip-us.apache.org/repos/asf/mesos/blob/c4c2ac80/src/tests/hierarchical_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp
index 88bb7e9..e044f83 100644
--- a/src/tests/hierarchical_allocator_tests.cpp
+++ b/src/tests/hierarchical_allocator_tests.cpp
@@ -1843,8 +1843,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaAbsentFramework)
class HierarchicalAllocator_BENCHMARK_Test
: public HierarchicalAllocatorTestBase,
- public WithParamInterface<std::tr1::tuple<size_t, size_t>>
-{};
+ public WithParamInterface<std::tr1::tuple<size_t, size_t>> {};
// The Hierarchical Allocator benchmark tests are parameterized
http://git-wip-us.apache.org/repos/asf/mesos/blob/c4c2ac80/src/tests/registrar_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp
index c502223..6064621 100644
--- a/src/tests/registrar_tests.cpp
+++ b/src/tests/registrar_tests.cpp
@@ -996,9 +996,9 @@ TEST_P(RegistrarTest, Abort)
}
-class Registrar_BENCHMARK_Test : public RegistrarTestBase,
- public WithParamInterface<size_t>
-{};
+class Registrar_BENCHMARK_Test
+ : public RegistrarTestBase,
+ public WithParamInterface<size_t> {};
// The Registrar benchmark tests are parameterized by the number of slaves.