Author: junping_du
Date: Wed Jan 15 11:02:23 2014
New Revision: 1558339
URL: http://svn.apache.org/r1558339
Log:
svn merge -c -1558337 . for reverting YARN-1603, which only partly committed.
Modified:
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1558339&r1=1558338&r2=1558339&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Wed Jan 15 11:02:23 2014
@@ -335,9 +335,6 @@ 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
