You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ti...@apache.org on 2016/01/05 13:54:22 UTC
mesos git commit: Removed redundant constructor.
Repository: mesos
Updated Branches:
refs/heads/master 77dfe6d15 -> c0f8645dd
Removed redundant constructor.
Review: https://reviews.apache.org/r/41880/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c0f8645d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c0f8645d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c0f8645d
Branch: refs/heads/master
Commit: c0f8645ddf303f02985073dce26873e7d0a046e5
Parents: 77dfe6d
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Tue Jan 5 13:51:57 2016 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Tue Jan 5 13:51:57 2016 +0100
----------------------------------------------------------------------
include/mesos/v1/scheduler.hpp | 6 ------
src/examples/event_call_framework.cpp | 2 ++
src/scheduler/scheduler.cpp | 9 ---------
src/tests/master_maintenance_tests.cpp | 3 +++
4 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c0f8645d/include/mesos/v1/scheduler.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/v1/scheduler.hpp b/include/mesos/v1/scheduler.hpp
index b3157b9..fc8ae50 100644
--- a/include/mesos/v1/scheduler.hpp
+++ b/include/mesos/v1/scheduler.hpp
@@ -44,12 +44,6 @@ class MesosProcess; // Forward declaration.
class Mesos
{
public:
- // TODO(vinod): Remove this in favor of the below constructor.
- Mesos(const std::string& master,
- const std::function<void(void)>& connected,
- const std::function<void(void)>& disconnected,
- const std::function<void(const std::queue<Event>&)>& received);
-
Mesos(const std::string& master,
ContentType contentType,
const std::function<void(void)>& connected,
http://git-wip-us.apache.org/repos/asf/mesos/blob/c0f8645d/src/examples/event_call_framework.cpp
----------------------------------------------------------------------
diff --git a/src/examples/event_call_framework.cpp b/src/examples/event_call_framework.cpp
index c7b4de2..8cfe1a0 100644
--- a/src/examples/event_call_framework.cpp
+++ b/src/examples/event_call_framework.cpp
@@ -73,6 +73,7 @@ public:
: framework(_framework),
executor(_executor),
mesos(master,
+ mesos::ContentType::PROTOBUF,
process::defer(self(), &Self::connected),
process::defer(self(), &Self::disconnected),
process::defer(self(), &Self::received, lambda::_1)),
@@ -88,6 +89,7 @@ public:
: framework(_framework),
executor(_executor),
mesos(master,
+ mesos::ContentType::PROTOBUF,
process::defer(self(), &Self::connected),
process::defer(self(), &Self::disconnected),
process::defer(self(), &Self::received, lambda::_1)),
http://git-wip-us.apache.org/repos/asf/mesos/blob/c0f8645d/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index 797f8c8..a17872b 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -528,15 +528,6 @@ Mesos::Mesos(
}
-// Default ContentType is protobuf for HTTP requests.
-Mesos::Mesos(
- const string& master,
- const lambda::function<void(void)>& connected,
- const lambda::function<void(void)>& disconnected,
- const lambda::function<void(const queue<Event>&)>& received)
- : Mesos(master, ContentType::PROTOBUF, connected, disconnected, received) {}
-
-
Mesos::~Mesos()
{
terminate(process);
http://git-wip-us.apache.org/repos/asf/mesos/blob/c0f8645d/src/tests/master_maintenance_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_maintenance_tests.cpp b/src/tests/master_maintenance_tests.cpp
index a14435c..2ca1e87 100644
--- a/src/tests/master_maintenance_tests.cpp
+++ b/src/tests/master_maintenance_tests.cpp
@@ -389,6 +389,7 @@ TEST_F(MasterMaintenanceTest, PendingUnavailabilityTest)
Mesos mesos(
master.get(),
+ ContentType::PROTOBUF,
lambda::bind(&Callbacks::connected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1));
@@ -1088,6 +1089,7 @@ TEST_F(MasterMaintenanceTest, InverseOffers)
Mesos mesos(
master.get(),
+ ContentType::PROTOBUF,
lambda::bind(&Callbacks::connected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1));
@@ -1388,6 +1390,7 @@ TEST_F(MasterMaintenanceTest, InverseOffersFilters)
Mesos mesos(
master.get(),
+ ContentType::PROTOBUF,
lambda::bind(&Callbacks::connected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)),
lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1));