Author: vinodkv Date: Wed Jul 10 17:03:14 2013 New Revision: 1501853 URL: http://svn.apache.org/r1501853 Log: YARN-368. Fixed a typo in error message in Auxiliary services. Contributed by Albert Chu. svn merge --ignore-ancestry -c 1501852 ../../trunk/
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1501853&r1=1501852&r2=1501853&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Jul 10 17:03:14 2013 @@ -43,6 +43,9 @@ Release 2.1.1-beta - UNRELEASED BUG FIXES + YARN-368. Fixed a typo in error message in Auxiliary services. (Albert Chu + via vinodkv) + Release 2.1.0-beta - 2013-07-02 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java?rev=1501853&r1=1501852&r2=1501853&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java (original) +++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/AuxServices.java Wed Jul 10 17:03:14 2013 @@ -92,7 +92,7 @@ public class AuxServices extends Abstrac String.format(YarnConfiguration.NM_AUX_SERVICE_FMT, sName), null, AuxiliaryService.class); if (null == sClass) { - throw new RuntimeException("No class defiend for " + sName); + throw new RuntimeException("No class defined for " + sName); } AuxiliaryService s = ReflectionUtils.newInstance(sClass, conf); // TODO better use s.getName()?