You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/02/23 09:26:15 UTC
mesos git commit: Revert "Added ReservationType for dynamic
reservations."
Repository: mesos
Updated Branches:
refs/heads/master 9030e2dfe -> f8b0c00b9
Revert "Added ReservationType for dynamic reservations."
This reverts commit 01d391b4a1888ab43524f43aba3cf164d60c8276.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f8b0c00b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f8b0c00b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f8b0c00b
Branch: refs/heads/master
Commit: f8b0c00b91ecadbd4163821a0d4c418f63450dce
Parents: 9030e2d
Author: Jie Yu <yu...@gmail.com>
Authored: Mon Feb 23 00:25:21 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Feb 23 00:25:21 2015 -0800
----------------------------------------------------------------------
include/mesos/mesos.proto | 28 ----------------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/f8b0c00b/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 14ff7f9..9df972d 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -393,36 +393,8 @@ message Resource {
optional Value.Scalar scalar = 3;
optional Value.Ranges ranges = 4;
optional Value.Set set = 5;
-
- // The following are valid states for
- // (role, reservation_type) pairs.
- // - ("*", STATIC) -- unreserved
- // - (R, STATIC) -- statically reserved for role R
- // - (R, DYNAMIC) -- dynamically reserved for role R
- //
- // The following are valid transitions for
- // (role, reservation_type) pairs.
- // Reservation: ("*", STATIC) => (R, DYNAMIC)
- // "An unreserved resource can become dynamically reserved."
- //
- // Unreservation: (R, DYNAMIC) => ("*", STATIC)
- // "A dynamically reserved resource can become unreserved."
- //
- // NOTE 1: R refers to any string not "*".
- // NOTE 2: Static reservations cannot be set or changed by a framework.
- // These are set by a cluster administrator on slave start.
optional string role = 6 [default = "*"];
- enum ReservationType {
- STATIC = 0;
- DYNAMIC = 1;
- }
-
- // Describes the type of reservation. Reservations are made for
- // some specific role R. It can either be reserved statically by
- // an operator or dynamically by a framework.
- optional ReservationType reservation_type = 8 [default = STATIC];
-
message DiskInfo {
// Describes a persistent disk volume.
// A persistent disk volume will not be automatically garbage