svn merge -c 1506675 merging from trunk to branch-2 to fix YARN-968.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506678 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -791,6 +791,8 @@ Release 2.1.0-beta - 2013-07-02
     YARN-461. Fair scheduler should not accept apps with empty string queue name. 
     (ywskycn via tucu)
 
+    YARN-968. RM admin commands don't work. (vinodkv via kihwal)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.java

@@ -25,7 +25,7 @@ import org.apache.hadoop.yarn.proto.ResourceManagerAdministrationProtocol.Resour
 @Private
 @Unstable
 @ProtocolInfo(
-    protocolName = "org.apache.hadoop.yarn.api.ResourceManagerAdministrationProtocolPB",
+    protocolName = "org.apache.hadoop.yarn.server.api.ResourceManagerAdministrationProtocolPB",
     protocolVersion = 1)
 public interface ResourceManagerAdministrationProtocolPB extends ResourceManagerAdministrationProtocolService.BlockingInterface {