You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by me...@apache.org on 2016/03/24 05:07:41 UTC
[2/9] mesos git commit: Edited master's flag help strings to match
the agent.
Edited master's flag help strings to match the agent.
With the addition of the `--authenticate_http` and `--http_credentials`
flags for the agent, the flag help strings have been improved slightly.
This patch edits the master's help string to match that of the agent.
Review: https://reviews.apache.org/r/45088/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/265f4684
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/265f4684
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/265f4684
Branch: refs/heads/master
Commit: 265f46844e53587d032a42b9540f940e5b0b94a7
Parents: 5892058
Author: Greg Mann <gr...@mesosphere.io>
Authored: Wed Mar 23 02:30:47 2016 -0700
Committer: Adam B <ad...@mesosphere.io>
Committed: Wed Mar 23 21:07:23 2016 -0700
----------------------------------------------------------------------
docs/configuration.md | 2 +-
src/master/flags.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/265f4684/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index 103ba50..70686ad 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -518,7 +518,7 @@ Human readable name for the cluster, displayed in the webui.
Either a path to a text file with a list of credentials,
each line containing <code>principal</code> and <code>secret</code> separated by whitespace,
or, a path to a JSON-formatted file containing credentials.
-Path could be of the form <code>file:///path/to/file</code> or <code>/path/to/file</code>.
+Path can be of the form <code>file:///path/to/file</code> or <code>/path/to/file</code>.
JSON file Example:
<pre><code>{
"credentials": [
http://git-wip-us.apache.org/repos/asf/mesos/blob/265f4684/src/master/flags.cpp
----------------------------------------------------------------------
diff --git a/src/master/flags.cpp b/src/master/flags.cpp
index e6fea64..9b65dee 100644
--- a/src/master/flags.cpp
+++ b/src/master/flags.cpp
@@ -215,8 +215,8 @@ mesos::internal::master::Flags::Flags()
add(&Flags::authenticate_http,
"authenticate_http",
"If `true`, only authenticated requests for HTTP endpoints supporting\n"
- "authentication are allowed.\n"
- "If `false`, unauthenticated HTTP endpoint requests are also allowed.\n",
+ "authentication are allowed. If `false`, unauthenticated requests to\n"
+ "HTTP endpoints are also allowed.\n",
false);
add(&Flags::credentials,
@@ -225,7 +225,7 @@ mesos::internal::master::Flags::Flags()
"each line containing `principal` and `secret` separated by "
"whitespace,\n"
"or, a path to a JSON-formatted file containing credentials.\n"
- "Path could be of the form `file:///path/to/file` or `/path/to/file`."
+ "Path can be of the form `file:///path/to/file` or `/path/to/file`."
"\n"
"JSON file Example:\n"
"{\n"