hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From su...@apache.org
Subject [35/35] git commit: rebasing branch yarn-1051 with trunk to keep pace
Date Wed, 24 Sep 2014 21:13:26 GMT
rebasing branch yarn-1051 with trunk to keep pace


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b66ce3a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b66ce3a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b66ce3a

Branch: refs/heads/YARN-1051
Commit: 6b66ce3aa051b8c83e8843f7cc40548fda7bae99
Parents: a955079 d0dc7ea
Author: subru <subru@outlook.com>
Authored: Wed Sep 24 14:12:37 2014 -0700
Committer: subru <subru@outlook.com>
Committed: Wed Sep 24 14:12:37 2014 -0700

----------------------------------------------------------------------
 YARN-1051-CHANGES.txt                           |  4 +--
 .../src/main/proto/yarn_protos.proto            | 35 --------------------
 2 files changed, 2 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b66ce3a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
----------------------------------------------------------------------
diff --cc hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
index d07ce13,dc9c661..a66257d
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto
@@@ -342,41 -335,41 +342,6 @@@ message QueueUserACLInfoProto 
  }
  
  ////////////////////////////////////////////////////////////////////////
--////// From reservation_protocol /////////////////////////////////////
--////////////////////////////////////////////////////////////////////////
--
--message ReservationIdProto {
--  optional int64 id = 1;
--  optional int64 cluster_timestamp = 2;
--}
--
--message ReservationRequestProto {
--  optional ResourceProto capability = 1;
--  optional int32 num_containers = 2 [default = 1];
--  optional int32 concurrency = 3 [default = 1];
--  optional int64 duration = 4 [default = -1];
--}
--
--message ReservationRequestsProto {
--  repeated ReservationRequestProto reservation_resources = 1;
--  optional ReservationRequestInterpreterProto interpreter = 2 [default = R_ALL];
--}
--
--message ReservationDefinitionProto {
--  optional ReservationRequestsProto reservation_requests = 1;
--  optional int64 arrival = 2;
--  optional int64 deadline = 3;
--  optional string reservation_name = 4;
--}
--
--enum ReservationRequestInterpreterProto {
--  R_ANY = 0;
--  R_ALL = 1;
--  R_ORDER = 2;
--  R_ORDER_NO_GAP = 3;
-- }
--
--////////////////////////////////////////////////////////////////////////
  ////// From container_manager //////////////////////////////////////////
  ////////////////////////////////////////////////////////////////////////
  


Mime
View raw message