Author: jing9
Date: Wed Jan 15 23:31:58 2014
New Revision: 1558605
URL: http://svn.apache.org/r1558605
Log:
Merging r1557908 through r1558603 from trunk.
Modified:
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1557908-1558603
Modified: hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt?rev=1558605&r1=1558604&r2=1558605&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt Wed
Jan 15 23:31:58 2014
@@ -998,6 +998,16 @@ Release 2.1.0-beta - 2013-08-22
MAPREDUCE-4374. Fix child task environment variable config and add support
for Windows. (Chuan Liu via cnauroth)
+Release 2.0.6-alpha - 08/22/2013
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ OPTIMIZATIONS
+
Release 2.0.5-alpha - 06/06/2013
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1557908-1558603
Propchange: hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1557908-1558603
Propchange:
hadoop/common/branches/HDFS-5698/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1557908-1558603
