Move HDFS-7157 to HDFS CHANGES.txt

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

Branch: refs/heads/HDFS-6581
Commit: a45b331cc9b9c772504474c224aa23bcbac403db
Parents: a78953c
Author: Andrew Wang <[email protected]>
Authored: Mon Sep 29 13:17:21 2014 -0700
Committer: Andrew Wang <[email protected]>
Committed: Mon Sep 29 13:17:21 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 ---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a45b331c/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0153f3b..4cb1b73 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -758,9 +758,6 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11140. hadoop-aws only need test-scoped dependency on
     hadoop-common's tests jar. (Juan Yu via wang)
 
-    HDFS-7157. Using Time.now() for recording start/end time of reconfiguration
-    tasks (Lei Xu via cmccabe)
-
     HADOOP-1110. JavaKeystoreProvider should not report a key as created if it
     was not flushed to the backing file.
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a45b331c/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 cb4fc23..89a47e3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -749,6 +749,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7148. TestEncryptionZones#testIsEncryptedMethod fails on branch-2
     after archival storage merge. (wang)
 
+    HDFS-7157. Using Time.now() for recording start/end time of reconfiguration
+    tasks (Lei Xu via cmccabe)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an

Reply via email to