Merge r1595126 from trunk. Relocate entry in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595128 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jian He 2014-05-16 07:12:09 +00:00
parent f442377539
commit 0e30502841
1 changed files with 9 additions and 9 deletions

View File

@ -70,9 +70,6 @@ Release 2.5.0 - UNRELEASED
YARN-1981. Nodemanager version is not updated when a node reconnects (Jason YARN-1981. Nodemanager version is not updated when a node reconnects (Jason
Lowe via jeagles) Lowe via jeagles)
YARN-2053. Fixed a bug in AMS to not add null NMToken into NMTokens list from
previous attempts for work-preserving AM restart. (Wangda Tan via jianhe)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES
@ -99,12 +96,6 @@ Release 2.5.0 - UNRELEASED
YARN-2011. Fix typo and warning in TestLeafQueue (Chen He via junping_du) YARN-2011. Fix typo and warning in TestLeafQueue (Chen He via junping_du)
YARN-1976. Fix yarn application CLI to print the scheme of the tracking url
of failed/killed applications. (Junping Du via jianhe)
YARN-2016. Fix a bug in GetApplicationsRequestPBImpl to add the missed fields
to proto. (Junping Du via jianhe)
YARN-2042. String shouldn't be compared using == in YARN-2042. String shouldn't be compared using == in
QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza) QueuePlacementRule#NestedUserQueue#getQueueForApp (Chen He via Sandy Ryza)
@ -216,6 +207,15 @@ Release 2.4.1 - UNRELEASED
YARN-1986. In Fifo Scheduler, node heartbeat in between creating app and YARN-1986. In Fifo Scheduler, node heartbeat in between creating app and
attempt causes NPE (Hong Zhiguo via Sandy Ryza) attempt causes NPE (Hong Zhiguo via Sandy Ryza)
YARN-1976. Fix yarn application CLI to print the scheme of the tracking url
of failed/killed applications. (Junping Du via jianhe)
YARN-2016. Fix a bug in GetApplicationsRequestPBImpl to add the missed fields
to proto. (Junping Du via jianhe)
YARN-2053. Fixed a bug in AMS to not add null NMToken into NMTokens list from
previous attempts for work-preserving AM restart. (Wangda Tan via jianhe)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES