Author: jlowe Date: Thu Jan 16 23:18:17 2014 New Revision: 1558961 URL: http://svn.apache.org/r1558961 Log: svn merge -c 1558959 FIXES: Moving MR-5672 from bugs to improvements in CHANGES.txt
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1558961&r1=1558960&r2=1558961&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Jan 16 23:18:17 2014 @@ -52,6 +52,9 @@ Release 2.4.0 - UNRELEASED MAPREDUCE-3310. Custom grouping comparator cannot be set for Combiners (tucu) + MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j + (syslog) (Gera Shegalov via jlowe) + OPTIMIZATIONS MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza) @@ -129,9 +132,6 @@ Release 2.4.0 - UNRELEASED MAPREDUCE-5724. JobHistoryServer does not start if HDFS is not running. (tucu) - MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j - (syslog) (Gera Shegalov via jlowe) - Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES