mesos git commit: Fixed broken build due to re-introducing "internal" namespace.

[ti...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master f8b0c00b9 -> 550dd7922


Fixed broken build due to re-introducing "internal" namespace.

Part of it had to do with the introduction of anonymous modules that
happened in parallel to the introduction of "internal" namespace,
hence the "internal" patch was outdated.

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


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

Branch: refs/heads/master
Commit: 550dd7922a50061aff2fbeb68ef68c10479e21f5
Parents: f8b0c00
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Mon Feb 23 12:38:42 2015 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Mon Feb 23 12:38:42 2015 +0100

----------------------------------------------------------------------
 src/local/local.cpp           | 6 ++++++
 src/module/manager.hpp        | 2 +-
 src/tests/anonymous_tests.cpp | 1 -
 src/tests/isolator.hpp        | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/550dd792/src/local/local.cpp
----------------------------------------------------------------------
diff --git a/src/local/local.cpp b/src/local/local.cpp
index 377bd36..8189edb 100644
--- a/src/local/local.cpp
+++ b/src/local/local.cpp
@@ -76,6 +76,12 @@ using mesos::internal::master::Master;
 using mesos::internal::master::Registrar;
 using mesos::internal::master::Repairer;
 
+using mesos::internal::slave::Containerizer;
+using mesos::internal::slave::Fetcher;
+using mesos::internal::slave::GarbageCollector;
+using mesos::internal::slave::Slave;
+using mesos::internal::slave::StatusUpdateManager;
+
 using mesos::modules::Anonymous;
 using mesos::modules::ModuleManager;
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/550dd792/src/module/manager.hpp
----------------------------------------------------------------------
diff --git a/src/module/manager.hpp b/src/module/manager.hpp
index 14acd0a..4befb64 100644
--- a/src/module/manager.hpp
+++ b/src/module/manager.hpp
@@ -117,7 +117,7 @@ public:
   template <typename T>
   static std::vector<std::string> find()
   {
-    mesos::Lock lock(&mutex);
+    mesos::internal::Lock lock(&mutex);
 
     std::vector<std::string> names;
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/550dd792/src/tests/anonymous_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/anonymous_tests.cpp b/src/tests/anonymous_tests.cpp
index 541de7a..12d4eb4 100644
--- a/src/tests/anonymous_tests.cpp
+++ b/src/tests/anonymous_tests.cpp
@@ -34,7 +34,6 @@
 using namespace mesos;
 
 using namespace mesos::modules;
-using namespace mesos::tests;
 
 using std::string;
 using std::vector;

http://git-wip-us.apache.org/repos/asf/mesos/blob/550dd792/src/tests/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/isolator.hpp b/src/tests/isolator.hpp
index 7d1a36e..93537cb 100644
--- a/src/tests/isolator.hpp
+++ b/src/tests/isolator.hpp
@@ -41,7 +41,8 @@ public:
 
   MOCK_METHOD1(
       recover,
-      process::Future<Nothing>(const std::list<mesos::slave::ExecutorRunState>&));
+      process::Future<Nothing>(
+          const std::list<mesos::slave::ExecutorRunState>&));
 
   virtual process::Future<Option<CommandInfo> > prepare(
       const ContainerID& containerId,