Repository: hadoop Updated Branches: refs/heads/branch-2 e90f7ef98 -> d48957075
HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. (cherry picked from commit aeb13ef2ab657a1c2f9d9ed5f80783f788c4953a) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d4895707 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d4895707 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d4895707 Branch: refs/heads/branch-2 Commit: d48957075591e0c308da79eaa5412ca8f6f73c8a Parents: e90f7ef Author: Andrew Wang <w...@apache.org> Authored: Wed Feb 10 15:26:08 2016 -0800 Committer: Andrew Wang <w...@apache.org> Committed: Wed Feb 10 15:26:14 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hadoop-hdfs/src/main/proto/DatanodeProtocol.proto | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d4895707/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 3c952a1..5f09aca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1814,6 +1814,8 @@ Release 2.8.0 - UNRELEASED HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value (Kuhu Shukla via umamahesh) + HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto. (wang) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d4895707/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto index 3c5e7ed..a3b6139 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto @@ -219,8 +219,8 @@ message HeartbeatResponseProto { repeated DatanodeCommandProto cmds = 1; // Returned commands can be null required NNHAStatusHeartbeatProto haStatus = 2; optional RollingUpgradeStatusProto rollingUpgradeStatus = 3; - optional uint64 fullBlockReportLeaseId = 4 [ default = 0 ]; - optional RollingUpgradeStatusProto rollingUpgradeStatusV2 = 5; + optional RollingUpgradeStatusProto rollingUpgradeStatusV2 = 4; + optional uint64 fullBlockReportLeaseId = 5 [ default = 0 ]; } /**
