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 2015/09/24 20:10:15 UTC
mesos git commit: Updated documentation strings for --launcher flag.
Repository: mesos
Updated Branches:
refs/heads/master 2d715ec12 -> 015f51d0e
Updated documentation strings for --launcher flag.
Review: https://reviews.apache.org/r/38697
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/015f51d0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/015f51d0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/015f51d0
Branch: refs/heads/master
Commit: 015f51d0edebc57c795ba292db7054f6c4017b24
Parents: 2d715ec
Author: Kapil Arya <ka...@mesosphere.io>
Authored: Thu Sep 24 11:09:54 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Sep 24 11:10:08 2015 -0700
----------------------------------------------------------------------
docs/configuration.md | 12 ++++++++++++
src/slave/flags.cpp | 8 ++++----
2 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/015f51d0/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index f18d15b..a09bed1 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1195,6 +1195,18 @@ file:///path/to/file (where file contains one of the above)</code></pre>
</tr>
<tr>
<td>
+ --launcher=VALUE
+ </td>
+ <td>
+ The launcher to be used for Mesos containerizer. It could either be
+ 'linux' or 'posix'. The Linux launcher is required for cgroups
+ isolation and for any isolators that require Linux namespaces such as
+ network, pid, etc. If unspecified, the slave will choose the Linux
+ launcher if it's running as root on Linux.
+ </td>
+ </tr>
+ <tr>
+ <td>
--launcher_dir=VALUE
</td>
<td>
http://git-wip-us.apache.org/repos/asf/mesos/blob/015f51d0/src/slave/flags.cpp
----------------------------------------------------------------------
diff --git a/src/slave/flags.cpp b/src/slave/flags.cpp
index 69976d7..10f68b8 100644
--- a/src/slave/flags.cpp
+++ b/src/slave/flags.cpp
@@ -72,10 +72,10 @@ mesos::internal::slave::Flags::Flags()
add(&Flags::launcher,
"launcher",
"The launcher to be used for Mesos containerizer. It could either be\n"
- "linux or posix. The linux launcher is required for cgroups isolation\n"
- "and for any isolators that require Linux namespaces such as network,\n"
- "pid, etc. If unspecified, the slave will choose the linux launcher if\n"
- "it's running as root on linux and started with --isolation flag.");
+ "'linux' or 'posix'. The Linux launcher is required for cgroups\n"
+ "isolation and for any isolators that require Linux namespaces such as\n"
+ "network, pid, etc. If unspecified, the slave will choose the Linux
+ launcher if it's running as root on Linux.");
add(&Flags::image_providers,
"image_providers",