You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/02/06 03:41:19 UTC

mesos git commit: Removed #include slave/flags.hpp from isolator.hpp.

Repository: mesos
Updated Branches:
  refs/heads/master 830f4b3a9 -> c576f16f8


Removed #include slave/flags.hpp from isolator.hpp.

Slave flags are not being used in isolator.hpp. Removed #include
slave/flags.hpp from isolator.hpp and included it directly in only
those files that need it.

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


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

Branch: refs/heads/master
Commit: c576f16f836dd3e6659d9b76a89704bb692f2ed0
Parents: 830f4b3
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Thu Feb 5 16:18:53 2015 -0800
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Thu Feb 5 16:18:53 2015 -0800

----------------------------------------------------------------------
 src/slave/containerizer/isolator.hpp                     | 1 -
 src/slave/containerizer/isolators/cgroups/cpushare.hpp   | 2 ++
 src/slave/containerizer/isolators/cgroups/mem.hpp        | 2 ++
 src/slave/containerizer/isolators/cgroups/perf_event.hpp | 2 ++
 src/slave/containerizer/isolators/filesystem/shared.hpp  | 2 ++
 src/slave/containerizer/isolators/namespaces/pid.hpp     | 2 ++
 src/slave/containerizer/isolators/posix.hpp              | 2 ++
 src/slave/containerizer/isolators/posix/disk.hpp         | 2 ++
 8 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolator.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolator.hpp b/src/slave/containerizer/isolator.hpp
index 2226fa2..e39a8a5 100644
--- a/src/slave/containerizer/isolator.hpp
+++ b/src/slave/containerizer/isolator.hpp
@@ -31,7 +31,6 @@
 
 #include <stout/try.hpp>
 
-#include "slave/flags.hpp"
 #include "slave/state.hpp"
 
 namespace mesos {

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/cgroups/cpushare.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/cpushare.hpp b/src/slave/containerizer/isolators/cgroups/cpushare.hpp
index bcfa76d..1050af7 100644
--- a/src/slave/containerizer/isolators/cgroups/cpushare.hpp
+++ b/src/slave/containerizer/isolators/cgroups/cpushare.hpp
@@ -23,6 +23,8 @@
 
 #include <stout/hashmap.hpp>
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 #include "slave/containerizer/isolators/cgroups/constants.hpp"

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/cgroups/mem.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.hpp b/src/slave/containerizer/isolators/cgroups/mem.hpp
index 735cefc..4de5c64 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.hpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.hpp
@@ -21,6 +21,8 @@
 
 #include <stout/hashmap.hpp>
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 #include "slave/containerizer/isolators/cgroups/constants.hpp"

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/cgroups/perf_event.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/perf_event.hpp b/src/slave/containerizer/isolators/cgroups/perf_event.hpp
index 12d1b89..6bf8858 100644
--- a/src/slave/containerizer/isolators/cgroups/perf_event.hpp
+++ b/src/slave/containerizer/isolators/cgroups/perf_event.hpp
@@ -27,6 +27,8 @@
 
 #include "linux/perf.hpp"
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 namespace mesos {

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/filesystem/shared.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/filesystem/shared.hpp b/src/slave/containerizer/isolators/filesystem/shared.hpp
index eeb722d..a5b5ca1 100644
--- a/src/slave/containerizer/isolators/filesystem/shared.hpp
+++ b/src/slave/containerizer/isolators/filesystem/shared.hpp
@@ -19,6 +19,8 @@
 #ifndef __SHARED_FILESYSTEM_ISOLATOR_HPP__
 #define __SHARED_FILESYSTEM_ISOLATOR_HPP__
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 namespace mesos {

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/namespaces/pid.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/namespaces/pid.hpp b/src/slave/containerizer/isolators/namespaces/pid.hpp
index fae909f..7052a03 100644
--- a/src/slave/containerizer/isolators/namespaces/pid.hpp
+++ b/src/slave/containerizer/isolators/namespaces/pid.hpp
@@ -19,6 +19,8 @@
 #ifndef __NAMESPACES_PID_ISOLATOR_HPP__
 #define __NAMESPACES_PID_ISOLATOR_HPP__
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 #include <sys/types.h>

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/posix.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/posix.hpp b/src/slave/containerizer/isolators/posix.hpp
index 1c0e963..b6d289b 100644
--- a/src/slave/containerizer/isolators/posix.hpp
+++ b/src/slave/containerizer/isolators/posix.hpp
@@ -25,6 +25,8 @@
 
 #include <process/future.hpp>
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 #include "usage/usage.hpp"

http://git-wip-us.apache.org/repos/asf/mesos/blob/c576f16f/src/slave/containerizer/isolators/posix/disk.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/posix/disk.hpp b/src/slave/containerizer/isolators/posix/disk.hpp
index 5995329..58a06c7 100644
--- a/src/slave/containerizer/isolators/posix/disk.hpp
+++ b/src/slave/containerizer/isolators/posix/disk.hpp
@@ -27,6 +27,8 @@
 #include <stout/duration.hpp>
 #include <stout/hashmap.hpp>
 
+#include "slave/flags.hpp"
+
 #include "slave/containerizer/isolator.hpp"
 
 namespace mesos {