You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/08/25 18:45:32 UTC

[6/8] mesos git commit: Fixed the using statements in MesosContainerizer.

Fixed the using statements in MesosContainerizer.

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


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

Branch: refs/heads/master
Commit: a910aba7efbf1988fa5af32b409aca703afe215f
Parents: 72c9f2d
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Aug 24 20:22:52 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Aug 25 11:45:23 2016 -0700

----------------------------------------------------------------------
 src/slave/containerizer/mesos/containerizer.cpp | 25 ++++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/a910aba7/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index 7a0b4ba..ccc66c7 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -118,17 +118,24 @@
 #include "slave/containerizer/mesos/launch.hpp"
 #include "slave/containerizer/mesos/provisioner/provisioner.hpp"
 
+using process::collect;
+using process::dispatch;
+using process::defer;
+
+using process::Failure;
+using process::Future;
+using process::Owned;
+
 using std::list;
 using std::map;
 using std::set;
 using std::string;
 using std::vector;
 
-using namespace process;
-
-namespace mesos {
-namespace internal {
-namespace slave {
+using mesos::internal::slave::state::SlaveState;
+using mesos::internal::slave::state::FrameworkState;
+using mesos::internal::slave::state::ExecutorState;
+using mesos::internal::slave::state::RunState;
 
 using mesos::modules::ModuleManager;
 
@@ -140,11 +147,9 @@ using mesos::slave::ContainerState;
 using mesos::slave::ContainerTermination;
 using mesos::slave::Isolator;
 
-using state::SlaveState;
-using state::FrameworkState;
-using state::ExecutorState;
-using state::RunState;
-
+namespace mesos {
+namespace internal {
+namespace slave {
 
 Try<MesosContainerizer*> MesosContainerizer::create(
     const Flags& flags,