You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2014/08/27 04:29:54 UTC
git commit: Removed duplicate headers imports
Repository: mesos
Updated Branches:
refs/heads/master b5b273590 -> aff24fb1a
Removed duplicate headers imports
Review: https://reviews.apache.org/r/25042
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/aff24fb1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/aff24fb1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/aff24fb1
Branch: refs/heads/master
Commit: aff24fb1a7dc0e9f40cb07ea4d33a655289eb518
Parents: b5b2735
Author: Timothy Chen <tn...@apache.org>
Authored: Tue Aug 26 15:09:19 2014 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Tue Aug 26 15:09:52 2014 -0700
----------------------------------------------------------------------
src/java/jni/org_apache_mesos_Log.cpp | 1 -
src/sched/sched.cpp | 9 +++------
src/scheduler/scheduler.cpp | 2 --
src/tests/zookeeper.cpp | 2 --
4 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/aff24fb1/src/java/jni/org_apache_mesos_Log.cpp
----------------------------------------------------------------------
diff --git a/src/java/jni/org_apache_mesos_Log.cpp b/src/java/jni/org_apache_mesos_Log.cpp
index 0548913..1e1d821 100644
--- a/src/java/jni/org_apache_mesos_Log.cpp
+++ b/src/java/jni/org_apache_mesos_Log.cpp
@@ -31,7 +31,6 @@
#include "org_apache_mesos_Log.h"
#include "org_apache_mesos_Log_Reader.h"
#include "org_apache_mesos_Log_Writer.h"
-#include "org_apache_mesos_Log_Writer.h"
using namespace mesos;
using namespace mesos::internal::log;
http://git-wip-us.apache.org/repos/asf/mesos/blob/aff24fb1/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index a8c3fe6..a37ed3d 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -35,9 +35,8 @@
#include <process/defer.hpp>
#include <process/delay.hpp>
-#include <process/future.hpp>
-#include <process/id.hpp>
#include <process/dispatch.hpp>
+#include <process/future.hpp>
#include <process/id.hpp>
#include <process/owned.hpp>
#include <process/pid.hpp>
@@ -65,15 +64,13 @@
#include "common/lock.hpp"
#include "common/type_utils.hpp"
-#include "master/detector.hpp"
-
#include "local/local.hpp"
-#include "master/detector.hpp"
-
#include "logging/flags.hpp"
#include "logging/logging.hpp"
+#include "master/detector.hpp"
+
#include "messages/messages.hpp"
using namespace mesos;
http://git-wip-us.apache.org/repos/asf/mesos/blob/aff24fb1/src/scheduler/scheduler.cpp
----------------------------------------------------------------------
diff --git a/src/scheduler/scheduler.cpp b/src/scheduler/scheduler.cpp
index 1cee72d..fb88a3e 100644
--- a/src/scheduler/scheduler.cpp
+++ b/src/scheduler/scheduler.cpp
@@ -61,8 +61,6 @@
#include "local/local.hpp"
-#include "master/detector.hpp"
-
#include "logging/flags.hpp"
#include "logging/logging.hpp"
http://git-wip-us.apache.org/repos/asf/mesos/blob/aff24fb1/src/tests/zookeeper.cpp
----------------------------------------------------------------------
diff --git a/src/tests/zookeeper.cpp b/src/tests/zookeeper.cpp
index 29656eb..e45f956 100644
--- a/src/tests/zookeeper.cpp
+++ b/src/tests/zookeeper.cpp
@@ -28,7 +28,6 @@
#include <jvm/jvm.hpp>
#include <jvm/org/apache/log4j.hpp>
-#include <jvm/org/apache/log4j.hpp>
#include <stout/check.hpp>
#include <stout/lambda.hpp>
@@ -186,4 +185,3 @@ ZooKeeperTest::TestWatcher::awaitEvent(
} // namespace tests {
} // namespace internal {
} // namespace mesos {
-