Repository: hadoop Updated Branches: refs/heads/branch-3.0 f982ffe33 -> 01b047b41
YARN-7219. Make AllocateRequestProto compatible with branch-2/branch-2.8. (rchiang) (cherry picked from commit 67e12169b0ae8f3a9edb6511d3ea7ffd57b82e75) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/01b047b4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/01b047b4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/01b047b4 Branch: refs/heads/branch-3.0 Commit: 01b047b41bb43200f9d95ec8db11196b8ff45be6 Parents: f982ffe Author: Ray Chiang <[email protected]> Authored: Tue Oct 3 14:57:56 2017 -0700 Committer: Ray Chiang <[email protected]> Committed: Tue Oct 3 15:16:31 2017 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-api/src/main/proto/yarn_service_protos.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/01b047b4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto index 7a7f035..2498142 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/proto/yarn_service_protos.proto @@ -87,7 +87,7 @@ message AllocateRequestProto { optional ResourceBlacklistRequestProto blacklist_request = 3; optional int32 response_id = 4; optional float progress = 5; - repeated UpdateContainerRequestProto update_requests = 6; + repeated UpdateContainerRequestProto update_requests = 7; } message NMTokenProto { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
