Update CHANGES.txt to reflect merge.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229468 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-01-10 05:11:54 +00:00
parent 849c68c7b5
commit 469f9e2db1
1 changed files with 3 additions and 3 deletions

View File

@ -71,9 +71,6 @@ Trunk (unreleased changes)
HADOOP-7574. Improve FSShell -stat, add user/group elements. HADOOP-7574. Improve FSShell -stat, add user/group elements.
(XieXianshan via harsh) (XieXianshan via harsh)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead.
(XieXianshan via harsh)
HADOOP-7919. Remove the unused hadoop.logfile.* properties from the HADOOP-7919. Remove the unused hadoop.logfile.* properties from the
core-default.xml file. (harsh) core-default.xml file. (harsh)
@ -203,6 +200,9 @@ Release 0.23.1 - Unreleased
HADOOP-7934. Normalize dependencies versions across all modules. (tucu) HADOOP-7934. Normalize dependencies versions across all modules. (tucu)
HADOOP-7348. Change 'addnl' in getmerge util to be a flag '-nl' instead.
(XieXianshan via harsh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES