rebasing branch yarn-1051 with trunk to keep pace

YARN-1051-CHANGES.txt

@@ -5,10 +5,10 @@ YARN-2475. Logic for responding to capacity drops for the
 ReservationSystem. (Carlo Curino and Subru Krishnan via curino)
 
 YARN-1708. Public YARN APIs for creating/updating/deleting 
-reservations. (Carlo Curino and Subru Krishnan via subru)
+reservations. (Subru Krishnan and Carlo Curino  via subru)
 
 YARN-1709. In-memory data structures used to track resources over
-time to enable reservations. (Carlo Curino and Subru Krishnan via 
+time to enable reservations. (Subru Krishnan and Carlo Curino via 
 subru)
 
 YARN-1710. Logic to find allocations within a Plan that satisfy 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_protos.proto

@@ -341,41 +341,6 @@ message QueueUserACLInfoProto {
   repeated QueueACLProto userAcls = 2;
 }
 
-////////////////////////////////////////////////////////////////////////
-////// 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 //////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////