Repository: mesos Updated Branches: refs/heads/master 6fe4be921 -> 4faca73e9
Updated protobuf comments for Image::Secret. Review: https://reviews.apache.org/r/59010 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/90385489 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/90385489 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/90385489 Branch: refs/heads/master Commit: 903854890b86288fab88b77c6264ea6e2abb17ee Parents: 6fe4be9 Author: Gilbert Song <songzihao1...@gmail.com> Authored: Thu May 4 16:12:09 2017 -0700 Committer: Gilbert Song <songzihao1...@gmail.com> Committed: Thu May 25 01:04:29 2017 +0800 ---------------------------------------------------------------------- include/mesos/mesos.proto | 14 ++++++-------- include/mesos/v1/mesos.proto | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/90385489/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 5ac35f4..b063dda 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -2150,16 +2150,14 @@ message Image { // NOTE: This is not encrypted, therefore framework and operators // should enable SSL when passing this information. // - // This is field is never used in Mesos before and is deprecated - // since Mesos 1.3. Please use the `Secret::Value` field `config` - // below (see MESOS-7088 for details). + // This field has never been used in Mesos before and is + // deprecated since Mesos 1.3. Please use `config` below + // (see MESOS-7088 for details). optional Credential credential = 2 [deprecated = true]; // Since 1.3. - // The UTF-8 character encoded byte data, which is expected as - // a docker config file in JSON format. This field is used for - // supporting docker private registry credential per container. - // Users can specify different docker config files for pulling - // their private images from different registries. + // Docker config containing credentails to authenticate with + // docker registry. The secret is expected to be a docker + // config file in JSON format with UTF-8 character encoding. optional Secret config = 3; } http://git-wip-us.apache.org/repos/asf/mesos/blob/90385489/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index dc58acc..bc7dbe0 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -2144,16 +2144,14 @@ message Image { // NOTE: This is not encrypted, therefore framework and operators // should enable SSL when passing this information. // - // This is field is never used in Mesos before and is deprecated - // since Mesos 1.3. Please use the `Secret::Value` field `config` - // below (see MESOS-7088 for details). + // This field has never been used in Mesos before and is + // deprecated since Mesos 1.3. Please use `config` below + // (see MESOS-7088 for details). optional Credential credential = 2 [deprecated = true]; // Since 1.3. - // The UTF-8 character encoded byte data, which is expected as - // a docker config file in JSON format. This field is used for - // supporting docker private registry credential per container. - // Users can specify different docker config files for pulling - // their private images from different registries. + // Docker config containing credentails to authenticate with + // docker registry. The secret is expected to be a docker + // config file in JSON format with UTF-8 character encoding. optional Secret config = 3; }
