Revision 1595133

Jump to revision:
Author:	jianhe
Date:	Fri May 16 07:34:22 2014 UTC (9 years, 11 months ago)
Changed paths:	3
Log Message:	Merge r1595117 and r1595128 from branch-2.

Changed paths

Path	Details
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt	modified , text changed
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java	modified , text changed
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/applicationsmanager/TestAMRestart.java	modified , text changed