You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ka...@apache.org on 2016/04/18 14:22:25 UTC
[05/11] mesos git commit: Removed unsed headers from master
contender/detector files.
Removed unsed headers from master contender/detector files.
Review: https://reviews.apache.org/r/45901
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9ac2ddae
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9ac2ddae
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9ac2ddae
Branch: refs/heads/master
Commit: 9ac2ddae78a26c2730b2a1c15e14f64b17a8583b
Parents: a4e11f8
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Thu Apr 7 18:24:06 2016 -0400
Committer: Kapil Arya <ka...@mesosphere.io>
Committed: Sun Apr 17 23:38:26 2016 -0400
----------------------------------------------------------------------
src/master/contender/contender.cpp | 15 ++-------------
src/master/contender/standalone.cpp | 17 +++--------------
src/master/contender/standalone.hpp | 5 -----
src/master/contender/zookeeper.cpp | 15 ++++-----------
src/master/contender/zookeeper.hpp | 10 ++++------
src/master/detector/detector.cpp | 21 ++-------------------
src/master/detector/standalone.cpp | 18 ++----------------
src/master/detector/standalone.hpp | 3 ---
src/master/detector/zookeeper.cpp | 13 ++-----------
src/master/detector/zookeeper.hpp | 9 ++++-----
src/tests/master_contender_detector_tests.cpp | 2 ++
11 files changed, 25 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/contender/contender.cpp
----------------------------------------------------------------------
diff --git a/src/master/contender/contender.cpp b/src/master/contender/contender.cpp
index 9ad6252..c412fb9 100644
--- a/src/master/contender/contender.cpp
+++ b/src/master/contender/contender.cpp
@@ -18,16 +18,7 @@
#include <mesos/module/contender.hpp>
-#include <process/defer.hpp>
-#include <process/id.hpp>
-#include <process/process.hpp>
-
#include <stout/check.hpp>
-#include <stout/lambda.hpp>
-#include <stout/protobuf.hpp>
-
-#include "master/constants.hpp"
-#include "master/master.hpp"
#include "master/contender/standalone.hpp"
#include "master/contender/zookeeper.hpp"
@@ -38,15 +29,13 @@
using std::string;
-using namespace process;
-
namespace mesos {
namespace master {
namespace contender {
Try<MasterContender*> MasterContender::create(
- const Option<std::string>& zk_,
- const Option<std::string>& masterContenderModule_)
+ const Option<string>& zk_,
+ const Option<string>& masterContenderModule_)
{
if (masterContenderModule_.isSome()) {
return modules::ModuleManager::create<MasterContender>(
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/contender/standalone.cpp
----------------------------------------------------------------------
diff --git a/src/master/contender/standalone.cpp b/src/master/contender/standalone.cpp
index 1895951..5db792f 100644
--- a/src/master/contender/standalone.cpp
+++ b/src/master/contender/standalone.cpp
@@ -14,20 +14,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <mesos/master/contender.hpp>
-
-#include <process/id.hpp>
-#include <process/process.hpp>
-
-#include <stout/check.hpp>
-#include <stout/protobuf.hpp>
-
-#include "master/constants.hpp"
-#include "master/master.hpp"
-
#include "master/contender/standalone.hpp"
-using std::string;
+#include <mesos/master/contender.hpp>
+
+#include <process/future.hpp>
using namespace process;
@@ -35,8 +26,6 @@ namespace mesos {
namespace master {
namespace contender {
-using namespace internal;
-
StandaloneMasterContender::~StandaloneMasterContender()
{
if (promise != NULL) {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/contender/standalone.hpp
----------------------------------------------------------------------
diff --git a/src/master/contender/standalone.hpp b/src/master/contender/standalone.hpp
index 511165c..256a4bc 100644
--- a/src/master/contender/standalone.hpp
+++ b/src/master/contender/standalone.hpp
@@ -21,12 +21,8 @@
#include <mesos/master/contender.hpp>
-#include <process/defer.hpp>
#include <process/future.hpp>
-#include <process/owned.hpp>
-#include <process/pid.hpp>
-#include <stout/lambda.hpp>
#include <stout/nothing.hpp>
namespace mesos {
@@ -61,5 +57,4 @@ private:
} // namespace master {
} // namespace mesos {
-
#endif // __MASTER_CONTENDER_STANDALONE_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/contender/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/master/contender/zookeeper.cpp b/src/master/contender/zookeeper.cpp
index 847c62e..ddc9e00 100644
--- a/src/master/contender/zookeeper.cpp
+++ b/src/master/contender/zookeeper.cpp
@@ -14,29 +14,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <mesos/master/contender.hpp>
+#include "master/contender/zookeeper.hpp"
-#include <mesos/module/contender.hpp>
+#include <mesos/master/contender.hpp>
-#include <process/defer.hpp>
+#include <process/dispatch.hpp>
#include <process/id.hpp>
#include <process/process.hpp>
-#include <stout/check.hpp>
-#include <stout/lambda.hpp>
+#include <stout/protobuf.hpp>
#include "master/constants.hpp"
-#include "master/master.hpp"
-
-#include "module/manager.hpp"
#include "zookeeper/contender.hpp"
-#include "zookeeper/detector.hpp"
#include "zookeeper/group.hpp"
#include "zookeeper/url.hpp"
-#include "master/contender/zookeeper.hpp"
-
using std::string;
using namespace process;
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/contender/zookeeper.hpp
----------------------------------------------------------------------
diff --git a/src/master/contender/zookeeper.hpp b/src/master/contender/zookeeper.hpp
index 0363ecd..2e9da74 100644
--- a/src/master/contender/zookeeper.hpp
+++ b/src/master/contender/zookeeper.hpp
@@ -17,17 +17,15 @@
#ifndef __MASTER_CONTENDER_ZOOKEEPER_HPP__
#define __MASTER_CONTENDER_ZOOKEEPER_HPP__
-#include <process/defer.hpp>
+#include <mesos/mesos.hpp>
+
+#include <mesos/master/contender.hpp>
+
#include <process/future.hpp>
#include <process/owned.hpp>
-#include <process/pid.hpp>
-#include <stout/lambda.hpp>
#include <stout/nothing.hpp>
-#include "messages/messages.hpp"
-
-#include "zookeeper/contender.hpp"
#include "zookeeper/group.hpp"
#include "zookeeper/url.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/detector/detector.cpp
----------------------------------------------------------------------
diff --git a/src/master/detector/detector.cpp b/src/master/detector/detector.cpp
index 3851732..56621f8 100644
--- a/src/master/detector/detector.cpp
+++ b/src/master/detector/detector.cpp
@@ -14,36 +14,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <set>
#include <string>
#include <mesos/master/detector.hpp>
#include <mesos/module/detector.hpp>
-#include <process/defer.hpp>
-#include <process/dispatch.hpp>
-#include <process/future.hpp>
-#include <process/id.hpp>
-#include <process/logging.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
-#include <stout/duration.hpp>
-#include <stout/foreach.hpp>
-#include <stout/lambda.hpp>
-#include <stout/protobuf.hpp>
-
#include "common/protobuf_utils.hpp"
-#include "master/constants.hpp"
-#include "master/master.hpp"
-
#include "master/detector/standalone.hpp"
#include "master/detector/zookeeper.hpp"
-#include "messages/messages.hpp"
-
#include "module/manager.hpp"
#include "zookeeper/url.hpp"
@@ -51,7 +35,6 @@
using namespace process;
using namespace zookeeper;
-using std::set;
using std::string;
namespace mesos {
@@ -59,8 +42,8 @@ namespace master {
namespace detector {
Try<MasterDetector*> MasterDetector::create(
- const Option<std::string>& zk_,
- const Option<std::string>& masterDetectorModule_)
+ const Option<string>& zk_,
+ const Option<string>& masterDetectorModule_)
{
if (masterDetectorModule_.isSome()) {
return modules::ModuleManager::create<MasterDetector>(
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/detector/standalone.cpp
----------------------------------------------------------------------
diff --git a/src/master/detector/standalone.cpp b/src/master/detector/standalone.cpp
index 0b5de9e..2b7c35c 100644
--- a/src/master/detector/standalone.cpp
+++ b/src/master/detector/standalone.cpp
@@ -14,8 +14,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "master/detector/standalone.hpp"
+
#include <set>
-#include <string>
#include <mesos/master/detector.hpp>
@@ -23,28 +24,13 @@
#include <process/dispatch.hpp>
#include <process/future.hpp>
#include <process/id.hpp>
-#include <process/logging.hpp>
-#include <process/pid.hpp>
#include <process/process.hpp>
-#include <stout/duration.hpp>
-#include <stout/foreach.hpp>
-#include <stout/lambda.hpp>
-#include <stout/protobuf.hpp>
-
#include "common/protobuf_utils.hpp"
-#include "master/constants.hpp"
-#include "master/master.hpp"
-
-#include "master/detector/standalone.hpp"
-
-#include "messages/messages.hpp"
-
using namespace process;
using std::set;
-using std::string;
namespace mesos {
namespace master {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/detector/standalone.hpp
----------------------------------------------------------------------
diff --git a/src/master/detector/standalone.hpp b/src/master/detector/standalone.hpp
index a4007a4..bbe3ce9 100644
--- a/src/master/detector/standalone.hpp
+++ b/src/master/detector/standalone.hpp
@@ -24,11 +24,8 @@
#include <mesos/master/detector.hpp>
#include <process/future.hpp>
-#include <process/owned.hpp>
#include <stout/option.hpp>
-#include <stout/stringify.hpp>
-#include <stout/try.hpp>
namespace mesos {
namespace master {
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/detector/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/master/detector/zookeeper.cpp b/src/master/detector/zookeeper.cpp
index 519a102..c829ae6 100644
--- a/src/master/detector/zookeeper.cpp
+++ b/src/master/detector/zookeeper.cpp
@@ -14,36 +14,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+#include "master/detector/zookeeper.hpp"
+
#include <set>
#include <string>
#include <mesos/master/detector.hpp>
-#include <mesos/module/detector.hpp>
-
#include <process/defer.hpp>
#include <process/dispatch.hpp>
#include <process/future.hpp>
#include <process/id.hpp>
-#include <process/logging.hpp>
#include <process/pid.hpp>
#include <process/process.hpp>
#include <stout/duration.hpp>
-#include <stout/foreach.hpp>
#include <stout/lambda.hpp>
#include <stout/protobuf.hpp>
#include "common/protobuf_utils.hpp"
#include "master/constants.hpp"
-#include "master/master.hpp"
-
-#include "master/detector/zookeeper.hpp"
-
-#include "messages/messages.hpp"
-
-#include "module/manager.hpp"
#include "zookeeper/detector.hpp"
#include "zookeeper/group.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/master/detector/zookeeper.hpp
----------------------------------------------------------------------
diff --git a/src/master/detector/zookeeper.hpp b/src/master/detector/zookeeper.hpp
index 0425053..8365e0f 100644
--- a/src/master/detector/zookeeper.hpp
+++ b/src/master/detector/zookeeper.hpp
@@ -19,16 +19,15 @@
#include <string>
+#include <mesos/mesos.hpp>
+
+#include <mesos/master/detector.hpp>
+
#include <process/future.hpp>
#include <process/owned.hpp>
#include <stout/option.hpp>
-#include <stout/stringify.hpp>
-#include <stout/try.hpp>
-
-#include "messages/messages.hpp"
-#include "zookeeper/detector.hpp"
#include "zookeeper/group.hpp"
#include "zookeeper/url.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/9ac2ddae/src/tests/master_contender_detector_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_contender_detector_tests.cpp b/src/tests/master_contender_detector_tests.cpp
index 1426a17..9ffd07b 100644
--- a/src/tests/master_contender_detector_tests.cpp
+++ b/src/tests/master_contender_detector_tests.cpp
@@ -55,6 +55,8 @@
#include "tests/zookeeper.hpp"
#endif
+#include "zookeeper/contender.hpp"
+
using namespace zookeeper;
using mesos::internal::master::Master;