mesos git commit: Updated master help message for acls.

[me...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 80a10db85 -> 58bde6268


Updated master help message for acls.

The ACL messages now moved from mesos.proto to authorizer.proto,
the mesos master help message and authorization.md should also
be updated to reflect this.

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


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

Branch: refs/heads/master
Commit: 58bde62684f53ace26f23fbc6d86bb3a015fd648
Parents: 80a10db
Author: Guangya Liu <gy...@gmail.com>
Authored: Wed Jan 6 16:51:35 2016 -0800
Committer: Adam B <ad...@mesosphere.io>
Committed: Wed Jan 6 16:51:35 2016 -0800

----------------------------------------------------------------------
 docs/authorization.md | 4 ++--
 src/master/flags.cpp  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/58bde626/docs/authorization.md
----------------------------------------------------------------------
diff --git a/docs/authorization.md b/docs/authorization.md
index 6375c9a..b4eb178 100644
--- a/docs/authorization.md
+++ b/docs/authorization.md
@@ -16,7 +16,7 @@ Authorization currently allows
 
 ## ACLs
 
-Authorization is implemented via Access Control Lists (ACLs). For each of the above cases, ACLs can be used to restrict access. Operators can setup ACLs in JSON format. See [mesos.proto](https://github.com/apache/mesos/blob/master/include/mesos/mesos.proto) for details.
+Authorization is implemented via Access Control Lists (ACLs). For each of the above cases, ACLs can be used to restrict access. Operators can setup ACLs in JSON format. See [authorizer.proto](https://github.com/apache/mesos/blob/master/include/mesos/authorizer/authorizer.proto) for details.
 
 Each ACL specifies a set of `Subjects` that can perform an `Action` on a set of `Objects`.
 
@@ -200,7 +200,7 @@ Authorization is configured by specifying the `--acls` flag when starting the ma
            or a file path containing the JSON-formatted ACLs used
            for authorization. Path could be of the form 'file:///path/to/file'
            or '/path/to/file'.
-           See the ACLs protobuf in mesos.proto for the expected format.
+           See the ACLs protobuf in authorizer.proto for the expected format.
 
 For more information on master command-line flags, see the
 [configuration](configuration.md) page.

http://git-wip-us.apache.org/repos/asf/mesos/blob/58bde626/src/master/flags.cpp
----------------------------------------------------------------------
diff --git a/src/master/flags.cpp b/src/master/flags.cpp
index 4aaa3e0..f864419 100644
--- a/src/master/flags.cpp
+++ b/src/master/flags.cpp
@@ -237,7 +237,7 @@ mesos::internal::master::Flags::Flags()
       "Note that if the flag --authorizers is provided with a value different\n"
       "than '" + DEFAULT_AUTHORIZER + "', the ACLs contents will be ignored.\n"
       "\n"
-      "See the ACLs protobuf in mesos.proto for the expected format.\n"
+      "See the ACLs protobuf in authorizer.proto for the expected format.\n"
       "\n"
       "Example:\n"
       "{\n"