svn merge -c -1558337 . for reverting YARN-1603, which only partly committed.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1558339 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Junping Du 2014-01-15 11:02:23 +00:00
parent 5ed1772f38
commit 2400f79db0

View File

@ -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