Author: vinodkv
Date: Thu Feb 6 19:08:09 2014
New Revision: 1565402
URL: http://svn.apache.org/r1565402
Log:
MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too.
svn merge --ignore-ancestry -c 1565401 ../../trunk/
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=1565402&r1=1565401&r2=1565402&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu
Feb 6 19:08:09 2014
@@ -211,7 +211,7 @@ Release 2.3.0 - UNRELEASED
(Mohammad Kamrul Islam via kasha)
MAPREDUCE-5743. Fixed the test failure in TestRMContainerAllocator.
- (Vinod Kumar Vavilapalli via zjshen)
+ (Ted Yu and Vinod Kumar Vavilapalli via zjshen)
Release 2.2.0 - 2013-10-13
