/[Apache-SVN]

Revision 1514136

Jump to revision:
Author:	acmurthy
Date:	Thu Aug 15 02:36:58 2013 UTC (11 years, 2 months ago)
Changed paths:	5
Log Message:	Merge -c 1514135 from trunk to branch-2 to fix YARN-1056. Remove dual use of string 'resourcemanager' in yarn.resourcemanager.connect.{max.wait.secs\|retry_interval.secs}. Contributed by Karthik Kambatla.

Changed paths

Path	Details
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt	modified , text changed
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java	modified , text changed
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml	modified , text changed
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java	modified , text changed

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26