Author: vinodkv
Date: Fri Sep 6 18:30:59 2013
New Revision: 1520660
URL: http://svn.apache.org/r1520660
Log:
Fixing CHANGES.txt for YARN-758 as it is now merged into branch-2.1-beta.
svn merge --ignore-ancestry -c 1520659 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1520660&r1=1520659&r2=1520660&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Fri Sep 6
18:30:59 2013
@@ -17,9 +17,6 @@ Release 2.3.0 - UNRELEASED
BUG FIXES
- YARN-758. Augment MockNM to use multiple cores (Karthik Kambatla via
- Sandy Ryza)
-
YARN-1060. Two tests in TestFairScheduler are missing @Test annotation
(Niranjan Singh via Sandy Ryza)
@@ -74,6 +71,9 @@ Release 2.1.1-beta - UNRELEASED
YARN-1065. NM should provide AuxillaryService data to the container (Xuan
Gong via bikas)
+ YARN-758. Augment MockNM to use multiple cores (Karthik Kambatla via
+ Sandy Ryza)
+
OPTIMIZATIONS
BUG FIXES
