[5/6] mesos git commit: Cleaned up includes in allocation sources.

[nn...@apache.org]

Cleaned up includes in allocation sources.

Review: https://reviews.apache.org/r/29929


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/336e4e2e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/336e4e2e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/336e4e2e

Branch: refs/heads/master
Commit: 336e4e2e6b1cee966f5b72bc23341c54e4813cc9
Parents: be6246a
Author: Alexander Rukletsov <al...@mesosphere.io>
Authored: Thu Feb 12 11:44:38 2015 -0800
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Feb 12 11:44:38 2015 -0800

----------------------------------------------------------------------
 src/local/local.cpp                         | 1 -
 src/master/allocator/allocator.hpp          | 6 ------
 src/master/allocator/mesos/hierarchical.hpp | 3 +--
 src/master/main.cpp                         | 1 -
 src/tests/master_tests.cpp                  | 1 -
 5 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/336e4e2e/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index 4b4ec99..1ef04b8 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -68,7 +68,6 @@ using namespace mesos;
 using namespace mesos::log;
 
 using mesos::master::allocator::Allocator;
-using mesos::master::allocator::DRFSorter;
 using mesos::master::allocator::HierarchicalDRFAllocator;
 
 using mesos::master::Master;

http://git-wip-us.apache.org/repos/asf/mesos/blob/336e4e2e/src/master/allocator/allocator.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/allocator.hpp b/src/master/allocator/allocator.hpp
index 7b857f0..b9d85cc 100644
--- a/src/master/allocator/allocator.hpp
+++ b/src/master/allocator/allocator.hpp
@@ -24,9 +24,7 @@
 
 #include <mesos/resources.hpp>
 
-#include <process/future.hpp>
 #include <process/dispatch.hpp>
-#include <process/pid.hpp>
 #include <process/process.hpp>
 
 #include <stout/hashmap.hpp>
@@ -36,13 +34,9 @@
 
 #include "master/flags.hpp"
 
-#include "messages/messages.hpp"
-
 namespace mesos {
 namespace master {
 
-class Master; // Forward declaration.
-
 namespace allocator {
 
 // Basic model of an allocator: resources are allocated to a framework

http://git-wip-us.apache.org/repos/asf/mesos/blob/336e4e2e/src/master/allocator/mesos/hierarchical.hpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.hpp b/src/master/allocator/mesos/hierarchical.hpp
index cf2e369..8ddf4f9 100644
--- a/src/master/allocator/mesos/hierarchical.hpp
+++ b/src/master/allocator/mesos/hierarchical.hpp
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <mesos/resources.hpp>
+#include <mesos/type_utils.hpp>
 
 #include <process/delay.hpp>
 #include <process/id.hpp>
@@ -34,8 +35,6 @@
 #include <stout/stopwatch.hpp>
 #include <stout/stringify.hpp>
 
-#include "master/master.hpp"
-
 #include "master/allocator/allocator.hpp"
 #include "master/allocator/sorter/drf/sorter.hpp"
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/336e4e2e/src/master/main.cpp
----------------------------------------------------------------------
diff --git a/src/master/main.cpp b/src/master/main.cpp
index 63408f4..a1efd2b 100644
--- a/src/master/main.cpp
+++ b/src/master/main.cpp
@@ -54,7 +54,6 @@
 
 #include "master/allocator/allocator.hpp"
 #include "master/allocator/mesos/hierarchical.hpp"
-#include "master/allocator/sorter/drf/sorter.hpp"
 
 #include "module/manager.hpp"
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/336e4e2e/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index b821038..e69a7fb 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -64,7 +64,6 @@ using namespace mesos::tests;
 using mesos::master::Master;
 
 using mesos::master::allocator::MesosAllocatorProcess;
-using mesos::master::allocator::HierarchicalDRFAllocatorProcess;
 
 using mesos::slave::GarbageCollectorProcess;
 using mesos::slave::Slave;