From 89fbc0ce189c2cc20d294607311266639804c430 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Thu, 6 Feb 2014 19:08:09 +0000 Subject: [PATCH] MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too. svn merge --ignore-ancestry -c 1565401 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565402 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index e908333fe64..a82bb36ded7 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -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