You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/06/03 19:30:40 UTC
mesos git commit: Added documentation that isolators flag are only
for the Mesos Containerizer.
Repository: mesos
Updated Branches:
refs/heads/master d983bc6a5 -> 296bb188d
Added documentation that isolators flag are only for the Mesos Containerizer.
Review: https://reviews.apache.org/r/34534
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/296bb188
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/296bb188
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/296bb188
Branch: refs/heads/master
Commit: 296bb188dee81f01661548ef2a20a2c0116460c0
Parents: d983bc6
Author: Joerg Schad <jo...@mesosphere.io>
Authored: Wed Jun 3 10:29:31 2015 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Wed Jun 3 10:29:31 2015 -0700
----------------------------------------------------------------------
docs/configuration.md | 2 +-
src/slave/flags.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/296bb188/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 4e20913..7d6e786 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1035,7 +1035,7 @@ file:///path/to/file (where file contains one of the above)</code></pre>
'cgroups/cpu,cgroups/mem', or network/port_mapping
(configure with flag: --with-network-isolator to enable),
or 'external', or load an alternate isolator module using
- the <code>--modules</code> flag. (default: posix/cpu,posix/mem)
+ the <code>--modules</code> flag. Note that this flag is only relevant for the Mesos Containerizer. (default: posix/cpu,posix/mem)
</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/mesos/blob/296bb188/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 17981b9..1ae106e 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -50,7 +50,8 @@ mesos::internal::slave::Flags::Flags()
"'cgroups/cpu,cgroups/mem', or network/port_mapping\n"
"(configure with flag: --with-network-isolator to enable),\n"
"or 'external', or load an alternate isolator module using\n"
- "the --modules flag.",
+ "the --modules flag. Note that this flag is only relevant\n"
+ "for the Mesos Containerizer.",
"posix/cpu,posix/mem");
add(&Flags::default_role,