diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0153f3b5321..4cb1b7327ed 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. diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cb4fc23b5ff..89a47e3a225 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