Author: junping_du
Date: Wed Jan 15 11:12:28 2014
New Revision: 1558342
URL: http://svn.apache.org/r1558342
Log:
Merge 1558340 from trunk: YARN-1603. Remove two *.orig files which were
unexpectedly committed. (Zhijie Shen via junping_du)
Removed:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java.orig
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java.orig
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=1558342&r1=1558341&r2=1558342&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Jan 15
11:12:28 2014
@@ -317,6 +317,9 @@ Release 2.4.0 - UNRELEASED
YARN-1598. HA-related rmadmin commands don't work on a secure cluster
(kasha)
+ YARN-1603. Remove two *.orig files which were unexpectedly committed.
+ (Zhijie Shen via junping_du)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
