Repository: hadoop Updated Branches: refs/heads/YARN-1051 6b66ce3aa -> 9fbe77a24
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/addc0538 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/addc0538 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/addc0538 Branch: refs/heads/YARN-1051 Commit: addc0538bab4db0c06ec048fb6872f707da192e1 Parents: a955079 d0dc7ea Author: subru <[email protected]> Authored: Wed Sep 24 14:12:37 2014 -0700 Committer: subru <[email protected]> Committed: Wed Sep 24 14:41:40 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/addc0538/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 ////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
