diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 52f53f326f..1cef543f6a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -269,9 +269,6 @@ Trunk (Unreleased) HADOOP-9433 TestLocalFileSystem#testHasFileDescriptor leaks file handle (Chris Nauroth via sanjay) - HADOOP-9806 PortmapInterface should check if the procedure is out-of-range - (brandonli) - OPTIMIZATIONS HADOOP-7761. Improve the performance of raw comparisons. (todd) @@ -339,6 +336,9 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9801. Configuration#writeXml uses platform defaulting encoding, which may mishandle multi-byte characters. (cnauroth) + HADOOP-9806 PortmapInterface should check if the procedure is out-of-range + (brandonli) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index ea01739a8b..9da190021f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -10,8 +10,6 @@ Trunk (Unreleased) HDFS-3125. Add JournalService to enable Journal Daemon. (suresh) - HDFS-4962 Use enum for nfs constants (Nicholas SZE via jing9) - IMPROVEMENTS HDFS-4665. Move TestNetworkTopologyWithNodeGroup to common. @@ -237,9 +235,6 @@ Trunk (Unreleased) HDFS-3934. duplicative dfs_hosts entries handled wrong. (Colin Patrick McCabe) - HDFS-5043. For HdfsFileStatus, set default value of childrenNum to -1 - instead of 0 to avoid confusing applications. (brandonli) - Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -273,6 +268,8 @@ Release 2.1.1-beta - UNRELEASED NEW FEATURES + HDFS-4962 Use enum for nfs constants (Nicholas SZE via jing9) + IMPROVEMENTS HDFS-4513. Clarify in the WebHDFS REST API that all JSON respsonses may @@ -288,6 +285,9 @@ Release 2.1.1-beta - UNRELEASED HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout. (zhaoyunjiong via szetszwo) + HDFS-5043. For HdfsFileStatus, set default value of childrenNum to -1 + instead of 0 to avoid confusing applications. (brandonli) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES