You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/05/30 23:21:00 UTC
git commit: Hid "acls" flag from master's flags.
Repository: mesos
Updated Branches:
refs/heads/master 4a2e63fe5 -> d903e7d32
Hid "acls" flag from master's flags.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d903e7d3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d903e7d3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d903e7d3
Branch: refs/heads/master
Commit: d903e7d32040f5be070f158e21c674deb6230540
Parents: 4a2e63f
Author: Vinod Kone <vi...@twitter.com>
Authored: Fri May 30 14:20:03 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Fri May 30 14:20:03 2014 -0700
----------------------------------------------------------------------
src/master/flags.hpp | 46 ++++++++++++++++++++++++----------------------
1 file changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d903e7d3/src/master/flags.hpp
----------------------------------------------------------------------
diff --git a/src/master/flags.hpp b/src/master/flags.hpp
index e890227..4863359 100644
--- a/src/master/flags.hpp
+++ b/src/master/flags.hpp
@@ -207,28 +207,30 @@ public:
"Each line contains 'principal' and 'secret' separated by whitespace.\n"
"Path could be of the form 'file:///path/to/file' or '/path/to/file'.");
- add(&Flags::acls,
- "acls",
- "The value could be a JSON formatted string of ACLs\n"
- "or a file path containing the JSON formatted ACLs used\n"
- "for authorization. Path could be of the form 'file:///path/to/file'\n"
- "or '/path/to/file'.\n"
- "\n"
- "See the ACL protobuf in mesos.proto for the expected format.\n"
- "\n"
- "Example:\n"
- "{\n"
- " \"run_tasks\": [\n"
- " {\n"
- " \"principals\": { values: [\"foo\", \"bar\"] },\n"
- " \"users\": { values: [\"root\"] }\n"
- " },\n"
- " {\n"
- " \"principals\": { type: \"ANY\" },\n"
- " \"users\": { values: [\"guest\"] }\n"
- " }\n"
- " ]\n"
- "}");
+ // TODO(vinod): Expose this flag once the authorization feature is
+ // code complete.
+// add(&Flags::acls,
+// "acls",
+// "The value could be a JSON formatted string of ACLs\n"
+// "or a file path containing the JSON formatted ACLs used\n"
+// "for authorization. Path could be of the form 'file:///path/to/file'\n"
+// "or '/path/to/file'.\n"
+// "\n"
+// "See the ACL protobuf in mesos.proto for the expected format.\n"
+// "\n"
+// "Example:\n"
+// "{\n"
+// " \"run_tasks\": [\n"
+// " {\n"
+// " \"principals\": { values: [\"foo\", \"bar\"] },\n"
+// " \"users\": { values: [\"root\"] }\n"
+// " },\n"
+// " {\n"
+// " \"principals\": { type: \"ANY\" },\n"
+// " \"users\": { values: [\"guest\"] }\n"
+// " }\n"
+// " ]\n"
+// "}");
}
bool version;