From 8819fda48900fac8bffc513536850e9856dd7609 Mon Sep 17 00:00:00 2001 From: Harsh J Date: Sat, 7 Jan 2012 03:44:48 +0000 Subject: [PATCH] Merged HDFS-2349, HDFS-2729, HDFS-2726, HDFS-554, HDFS-1314, HADOOP-7910 to branch-0.23, updating CHANGES.txt for trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1228567 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES.txt | 5 ++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 26 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 443176aeb4..3b5e3f1c09 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -12,8 +12,6 @@ Trunk (unreleased changes) HADOOP-7875. Add helper class to unwrap protobuf ServiceException. (suresh) - HADOOP-7910. Add Configuration.getLongBytes to handle human readable byte size values. (Sho Shimauchi via harsh) - IMPROVEMENTS HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm) @@ -155,6 +153,9 @@ Release 0.23.1 - Unreleased HADOOP-7657. Add support for LZ4 compression. (Binglin Chang via todd) + HADOOP-7910. Add Configuration.getLongBytes to handle human readable byte size values. (Sho Shimauchi via harsh) + + IMPROVEMENTS HADOOP-7801. HADOOP_PREFIX cannot be overriden. (Bruno Mahé via tomwhite) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index f45b7fa1cc..f9937154ef 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -90,8 +90,6 @@ Trunk (unreleased changes) HDFS-2564. Cleanup unnecessary exceptions thrown and unnecessary casts. (Hari Mankude via eli) - HDFS-2572. Remove unnecessary double-check in DN#getHostName. (harsh) - HDFS-2410. Further cleanup of hardcoded configuration keys and values. (suresh) @@ -110,12 +108,6 @@ Trunk (unreleased changes) HDFS-2669 Enable protobuf rpc for ClientNamenodeProtocol - HDFS-2726. Fix a logging issue under DFSClient's createBlockOutputStream method (harsh) - - HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh) - - HDFS-1314. Make dfs.blocksize accept size-indicating prefixes (Sho Shimauchi via harsh) - OPTIMIZATIONS HDFS-2477. Optimize computing the diff between a block report and the namenode state. (Tomasz Nykiel via hairong) @@ -126,8 +118,6 @@ Trunk (unreleased changes) HDFS-2476. More CPU efficient data structure for under-replicated, over-replicated, and invalidated blocks. (Tomasz Nykiel via todd) - HDFS-554. Use System.arraycopy in BlockInfo.ensureCapacity. (harsh) - BUG FIXES HDFS-2299. TestOfflineEditsViewer is failing on trunk. (Uma Maheswara Rao G via atm) @@ -148,9 +138,6 @@ Trunk (unreleased changes) HDFS-2373. Commands using WebHDFS and hftp print unnecessary debug info on the console with security enabled. (Arpit Gupta via suresh) - HDFS-2349. Corruption detected during block transfers between DNs - should log a WARN instead of INFO. (harsh) - HDFS-2188. Make FSEditLog create its journals from a list of URIs rather than NNStorage. (Ivan Kelly via jitendra) @@ -252,6 +239,19 @@ Release 0.23.1 - UNRELEASED HDFS-2511. Add dev script to generate HDFS protobufs. (tucu) + HDFS-2349. Corruption detected during block transfers between DNs + should log a WARN instead of INFO. (harsh) + + HDFS-2572. Remove unnecessary double-check in DN#getHostName. (harsh) + + HDFS-2729. Update BlockManager's comments regarding the invalid block set (harsh) + + HDFS-2726. Fix a logging issue under DFSClient's createBlockOutputStream method (harsh) + + HDFS-554. Use System.arraycopy in BlockInfo.ensureCapacity. (harsh) + + HDFS-1314. Make dfs.blocksize accept size-indicating prefixes (Sho Shimauchi via harsh) + OPTIMIZATIONS HDFS-2130. Switch default checksum to CRC32C. (todd)