Repository: mesos Updated Branches: refs/heads/master a7a87329c -> d43cfc14d
Updated comments, docs, and TODO referring to 0.29. Review: https://reviews.apache.org/r/48785/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/30653bb3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/30653bb3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/30653bb3 Branch: refs/heads/master Commit: 30653bb30a253a63774241a4889ff6ef3373816a Parents: a7a8732 Author: Alexander Rukletsov <ruklet...@gmail.com> Authored: Thu Jun 16 14:52:48 2016 +0200 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Jun 16 14:52:48 2016 +0200 ---------------------------------------------------------------------- docs/docker-containerizer.md | 2 +- docs/modules.md | 10 +++++----- docs/persistent-volume.md | 2 +- docs/weights.md | 2 +- include/mesos/authorizer/acls.proto | 6 +++--- include/mesos/authorizer/authorizer.proto | 2 +- include/mesos/mesos.proto | 6 +++--- include/mesos/v1/mesos.proto | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/docs/docker-containerizer.md ---------------------------------------------------------------------- diff --git a/docs/docker-containerizer.md b/docs/docker-containerizer.md index 38a7de9..7a7cb95 100644 --- a/docs/docker-containerizer.md +++ b/docs/docker-containerizer.md @@ -97,7 +97,7 @@ pointing to a `.dockercfg` that contains login information. The Containerizer set the HOME environment variable pointing to the sandbox so docker cli will automatically pick up the config file. -Starting from 0.29, we provide an alternative way to specify docker +Starting from 1.0, we provide an alternative way to specify docker config file for pulling images from private registries. We allow operators to specify a shared docker config file using an agent flag. This docker config file will be used to pull images from private http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/docs/modules.md ---------------------------------------------------------------------- diff --git a/docs/modules.md b/docs/modules.md index aa5e50c..340c912 100644 --- a/docs/modules.md +++ b/docs/modules.md @@ -361,23 +361,23 @@ must exist between the various versions: </tr> <tr> -<td>0.29.0 </td> <td> 0.18.0 </td> <td> 0.18.0 </td> <td> yes </td> <td> </td> +<td>1.0.0 </td> <td> 0.18.0 </td> <td> 0.18.0 </td> <td> yes </td> <td> </td> </tr> <tr> -<td>0.29.0 </td> <td> 0.18.0 </td> <td> 0.21.0 </td> <td> yes </td> <td> </td> +<td>1.0.0 </td> <td> 0.18.0 </td> <td> 0.21.0 </td> <td> yes </td> <td> </td> </tr> <tr> -<td>0.18.0 </td> <td> 0.18.0 </td> <td> 0.29.0 </td> <td> NO </td> <td> Library compiled against a newer Mesos release. </td> +<td>0.18.0 </td> <td> 0.18.0 </td> <td> 1.0.0 </td> <td> NO </td> <td> Library compiled against a newer Mesos release. </td> </tr> <tr> -<td>0.29.0 </td> <td> 0.21.0 </td> <td> 0.18.0 </td> <td> NO </td> <td> Module/Library older than the kind version supported by Mesos. </td> +<td>1.0.0 </td> <td> 0.21.0 </td> <td> 0.18.0 </td> <td> NO </td> <td> Module/Library older than the kind version supported by Mesos. </td> </tr> <tr> -<td>0.29.0 </td> <td> 0.29.0 </td> <td> 0.18.0 </td> <td> NO </td> <td> Module/Library older than the kind version supported by Mesos. </td> +<td>1.0.0 </td> <td> 1.0.0 </td> <td> 0.18.0 </td> <td> NO </td> <td> Module/Library older than the kind version supported by Mesos. </td> </tr> </table> http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/docs/persistent-volume.md ---------------------------------------------------------------------- diff --git a/docs/persistent-volume.md b/docs/persistent-volume.md index a9775b1..4a5d532 100644 --- a/docs/persistent-volume.md +++ b/docs/persistent-volume.md @@ -477,6 +477,6 @@ Persistent volumes were introduced in Mesos 0.23. Mesos 0.27 introduced HTTP endpoints for creating and destroying volumes. Mesos 0.28 introduced support for [multiple disk resources](multiple-disk.md), and also enhanced the `/slaves` master endpoint to include detailed information about persistent volumes and -dynamic reservations. Mesos 0.29 changed the semantics of destroying a volume: +dynamic reservations. Mesos 1.0 changed the semantics of destroying a volume: in previous releases, destroying a volume would remove the Mesos-level metadata, but would not remove the volume's data from the agent's filesystem. http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/docs/weights.md ---------------------------------------------------------------------- diff --git a/docs/weights.md b/docs/weights.md index 59d1579..011bc2a 100644 --- a/docs/weights.md +++ b/docs/weights.md @@ -13,7 +13,7 @@ role does not have a weight specified in the `--weights` flag, then the default value (1.0) will be used. Weights cannot be changed without updating the flag and restarting all Mesos masters. -Mesos 0.29 contains a [/weights](endpoints/master/weights.md) operator endpoint +Mesos 1.0 contains a [/weights](endpoints/master/weights.md) operator endpoint that allows weights to be changed at runtime. The `--weights` command-line flag is deprecated. http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/include/mesos/authorizer/acls.proto ---------------------------------------------------------------------- diff --git a/include/mesos/authorizer/acls.proto b/include/mesos/authorizer/acls.proto index 2ffcaa2..cc0b8ea 100644 --- a/include/mesos/authorizer/acls.proto +++ b/include/mesos/authorizer/acls.proto @@ -139,7 +139,7 @@ message ACL { // Which principals are authorized to set quotas for given roles. // // TODO(zhitao): Remove this message at the end of the deprecation cycle - // which started with 0.29. It will be fully replaced by `UpdateQuota`. + // which started with 1.0. It will be fully replaced by `UpdateQuota`. message SetQuota { // Subjects: Operator username. required Entity principals = 1; @@ -151,7 +151,7 @@ message ACL { // Which principals can remove quotas set by which other principals. // // TODO(zhitao): Remove this message at the end of the deprecation cycle - // which started with 0.29. It will be fully replaced by `UpdateQuota`. + // which started with 1.0. It will be fully replaced by `UpdateQuota`. message RemoveQuota { // Subjects: Operator username. required Entity principals = 1; @@ -275,7 +275,7 @@ message ACLs { repeated ACL.DestroyVolume destroy_volumes = 8; // TODO(zhitao): Remove the following two fields at the end - // of the deprecation cycle which started with 0.29. + // of the deprecation cycle which started with 1.0. repeated ACL.SetQuota set_quotas = 9 [deprecated = true]; repeated ACL.RemoveQuota remove_quotas = 10 [deprecated = true]; http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/include/mesos/authorizer/authorizer.proto ---------------------------------------------------------------------- diff --git a/include/mesos/authorizer/authorizer.proto b/include/mesos/authorizer/authorizer.proto index 931796f..ffbe4d0 100644 --- a/include/mesos/authorizer/authorizer.proto +++ b/include/mesos/authorizer/authorizer.proto @@ -68,7 +68,7 @@ enum Action { DESTROY_VOLUME_WITH_PRINCIPAL = 7; // TODO(zhitao): Remove the following two actions at the end of - // the deprecation cycle which started with 0.29. They will be + // the deprecation cycle which started with 1.0. They will be // fully replaced by `UPDATE_QUOTA_WITH_ROLE`. SET_QUOTA_WITH_ROLE = 8; // [deprecated = true]; DESTROY_QUOTA_WITH_PRINCIPAL = 9; // [deprecated = true]; http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index dbffb16..e48ac1a 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -478,9 +478,9 @@ message ExecutorInfo { // executor via JSON on the slave. This allows users to import usage // information into a time series database for monitoring. // - // This field is deprecated since 0.29.0. Please use labels for + // This field is deprecated since 1.0. Please use labels for // free-form metadata instead. - optional string source = 10 [deprecated = true]; // Since 0.29.0. + optional string source = 10 [deprecated = true]; // Since 1.0. optional bytes data = 4; @@ -1640,7 +1640,7 @@ message Volume { RO = 2; // read-only. } - // TODO(gyliu513): Make this as `optional` after deprecation cycle of 0.29. + // TODO(gyliu513): Make this as `optional` after deprecation cycle of 1.0. required Mode mode = 3; // Path pointing to a directory or file in the container. If the http://git-wip-us.apache.org/repos/asf/mesos/blob/30653bb3/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index 39967fa..dca0c2c 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -478,9 +478,9 @@ message ExecutorInfo { // executor via JSON on the agent. This allows users to import usage // information into a time series database for monitoring. // - // This field is deprecated since 0.29.0. Please use labels for + // This field is deprecated since 1.0. Please use labels for // free-form metadata instead. - optional string source = 10 [deprecated = true]; // Since 0.29.0. + optional string source = 10 [deprecated = true]; // Since 1.0. optional bytes data = 4; @@ -1590,7 +1590,7 @@ message Volume { RO = 2; // read-only. } - // TODO(gyliu513): Make this as `optional` after deprecation cycle of 0.29. + // TODO(gyliu513): Make this as `optional` after deprecation cycle of 1.0. required Mode mode = 3; // Path pointing to a directory or file in the container. If the @@ -1961,4 +1961,4 @@ message Flag { message Metric { required string name = 1; optional double value = 2; -} \ No newline at end of file +}
