You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/04/29 02:26:01 UTC
[1/2] mesos git commit: Updated FrameworkInfo::Capability::Type enum
for upgradability.
Repository: mesos
Updated Branches:
refs/heads/0.27.x 762763b41 -> bca997e0f
Updated FrameworkInfo::Capability::Type enum for upgradability.
Review: https://reviews.apache.org/r/45151
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0348f42a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0348f42a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0348f42a
Branch: refs/heads/0.27.x
Commit: 0348f42a390209b911e07c6a5fe94b55205e336c
Parents: 762763b
Author: Benjamin Mahler <bm...@apache.org>
Authored: Mon Mar 21 22:58:20 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Apr 28 16:35:24 2016 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 9 ++++++++-
include/mesos/v1/mesos.proto | 9 ++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0348f42a/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 370531e..286dd7a 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -254,13 +254,20 @@ message FrameworkInfo {
message Capability {
enum Type {
+ // This must be the first enum value in this list, to
+ // ensure that if 'type' is not set, the default value
+ // is UNKNOWN. This enables enum values to be added
+ // in a backwards-compatible way. See: MESOS-4997.
+ UNKNOWN = 0;
+
// Receive offers with revocable resources. See 'Resource'
// message for details.
// TODO(vinod): This is currently a no-op.
REVOCABLE_RESOURCES = 1;
}
- required Type type = 1;
+ // Enum fields should be optional, see: MESOS-4997.
+ optional Type type = 1;
}
// This field allows a framework to advertise its set of
http://git-wip-us.apache.org/repos/asf/mesos/blob/0348f42a/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 9474cea..e30f98f 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -254,13 +254,20 @@ message FrameworkInfo {
message Capability {
enum Type {
+ // This must be the first enum value in this list, to
+ // ensure that if 'type' is not set, the default value
+ // is UNKNOWN. This enables enum values to be added
+ // in a backwards-compatible way. See: MESOS-4997.
+ UNKNOWN = 0;
+
// Receive offers with revocable resources. See 'Resource'
// message for details.
// TODO(vinod): This is currently a no-op.
REVOCABLE_RESOURCES = 1;
}
- required Type type = 1;
+ // Enum fields should be optional, see: MESOS-4997.
+ optional Type type = 1;
}
// This field allows a framework to advertise its set of
[2/2] mesos git commit: Added backport of MESOS-5018 to 0.27.3.
Posted by bm...@apache.org.
Added backport of MESOS-5018 to 0.27.3.
This reflects the backport of MESOS-5018 to the 0.27.x branch.
Review: https://reviews.apache.org/r/46805
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bca997e0
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bca997e0
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bca997e0
Branch: refs/heads/0.27.x
Commit: bca997e0f4bd4b982787fcdbb9824b79ba2cf442
Parents: 0348f42
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu Apr 28 16:37:41 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Apr 28 17:14:53 2016 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bca997e0/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index ccc32f0..2f5d255 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ All Issues:
** Bug
* [MESOS-4705] - Linux 'perf' parsing logic may fail when OS distribution has perf backports.
* [MESOS-4869] - /usr/libexec/mesos/mesos-health-check using/leaking a lot of memory.
+ * [MESOS-5018] - FrameworkInfo Capability enum does not support upgrades.
* [MESOS-5021] - Memory leak in subprocess when 'environment' argument is provided.