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 as...@apache.org on 2016/02/11 09:00:18 UTC

[44/50] hadoop git commit: HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto.

HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aeb13ef2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aeb13ef2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aeb13ef2

Branch: refs/heads/yarn-2877
Commit: aeb13ef2ab657a1c2f9d9ed5f80783f788c4953a
Parents: df4dcd3
Author: Andrew Wang <wa...@apache.org>
Authored: Wed Feb 10 15:26:08 2016 -0800
Committer: Andrew Wang <wa...@apache.org>
Committed: Wed Feb 10 15:26:08 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/aeb13ef2/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 d691ceb..e407ef3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2726,6 +2726,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/aeb13ef2/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 7111185..9bae4c3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto
@@ -226,8 +226,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 ];
 }
 
 /**