YARN-777. Removed unreferenced objects from .proto files. Contributed by Jian He.
svn merge --ignore-ancestry -c 1490882 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490887 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8569297e98
commit
2f8a3e7cfd
|
@ -106,6 +106,9 @@ Release 2.1.0-beta - UNRELEASED
|
|||
YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. (Jian He
|
||||
via vinodkv)
|
||||
|
||||
YARN-777. Removed unreferenced objects from .proto files. (Jian He via
|
||||
vinodkv)
|
||||
|
||||
NEW FEATURES
|
||||
|
||||
YARN-482. FS: Extend SchedulingMode to intermediate queues.
|
||||
|
|
|
@ -88,25 +88,6 @@ enum FinalApplicationStatusProto {
|
|||
APP_KILLED = 3;
|
||||
}
|
||||
|
||||
message ApplicationStatusProto {
|
||||
optional int32 response_id = 1;
|
||||
optional ApplicationAttemptIdProto application_attempt_id = 2;
|
||||
optional float progress = 3;
|
||||
}
|
||||
|
||||
message ApplicationMasterProto {
|
||||
optional ApplicationIdProto application_id = 1;
|
||||
optional string host = 2;
|
||||
optional int32 rpc_port = 3;
|
||||
optional string trackingUrl = 4;
|
||||
optional ApplicationStatusProto status = 5;
|
||||
optional YarnApplicationStateProto state = 6;
|
||||
optional hadoop.common.TokenProto client_token = 7;
|
||||
optional int32 containerCount = 8;
|
||||
optional int32 amFailCount = 9;
|
||||
optional string diagnostics = 10 [default = ""];
|
||||
}
|
||||
|
||||
message URLProto {
|
||||
optional string scheme = 1;
|
||||
optional string host = 2;
|
||||
|
@ -325,11 +306,6 @@ enum ContainerExitStatusProto {
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
////// From common//////////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
message StringURLMapProto {
|
||||
optional string key = 1;
|
||||
optional URLProto value = 2;
|
||||
}
|
||||
|
||||
message StringLocalResourceMapProto {
|
||||
optional string key = 1;
|
||||
optional LocalResourceProto value = 2;
|
||||
|
|
Loading…
Reference in New Issue