You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2016/05/17 21:50:47 UTC
hadoop git commit: Addendum patch for YARN-4832. Contributed by
Junping Du
Repository: hadoop
Updated Branches:
refs/heads/trunk f6ef876fe -> 0c6726e20
Addendum patch for YARN-4832. Contributed by Junping Du
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c6726e2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c6726e2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c6726e2
Branch: refs/heads/trunk
Commit: 0c6726e20d9503589b21123f30757ddfbd405dde
Parents: f6ef876
Author: Jian He <ji...@apache.org>
Authored: Tue May 17 14:49:20 2016 -0700
Committer: Jian He <ji...@apache.org>
Committed: Tue May 17 14:50:30 2016 -0700
----------------------------------------------------------------------
.../src/main/proto/yarn_server_common_service_protos.proto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c6726e2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_service_protos.proto
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_service_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_service_protos.proto
index 7d39d30..a7e5a86 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_service_protos.proto
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/proto/yarn_server_common_service_protos.proto
@@ -101,8 +101,8 @@ message NodeHeartbeatResponseProto {
optional bool areNodeLabelsAcceptedByRM = 11 [default = false];
repeated ContainerProto containers_to_decrease = 12;
repeated SignalContainerRequestProto containers_to_signal = 13;
- optional ContainerQueuingLimitProto container_queuing_limit = 14;
- optional ResourceProto resource = 15;
+ optional ResourceProto resource = 14;
+ optional ContainerQueuingLimitProto container_queuing_limit = 15;
}
message ContainerQueuingLimitProto {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org