Arun Murthy 77a60701c1 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. ... git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514136 13f79535-47bb-0310-9956-ffa450edef68		2013-08-15 02:36:58 +00:00
..
java/org/apache/hadoop/yarn	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.	2013-08-15 02:36:58 +00:00
proto	YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu)	2013-07-27 20:08:59 +00:00