hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hadoop git commit: HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto.
Date Wed, 10 Feb 2016 23:26:48 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 4324a3d01 -> 47746f65b


HDFS-9788. Incompatible tag renumbering in HeartbeatResponseProto.

(cherry picked from commit aeb13ef2ab657a1c2f9d9ed5f80783f788c4953a)
(cherry picked from commit d48957075591e0c308da79eaa5412ca8f6f73c8a)


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

Branch: refs/heads/branch-2.8
Commit: 47746f65b0a43a4dbf32667a48bda9e369f2f0e8
Parents: 4324a3d
Author: Andrew Wang <wang@apache.org>
Authored: Wed Feb 10 15:26:08 2016 -0800
Committer: Andrew Wang <wang@apache.org>
Committed: Wed Feb 10 15:26:34 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/47746f65/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 8d9f83b..2942823 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1741,6 +1741,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/47746f65/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 ];
 }
 
 /**


Mime
View raw message