Author: kihwal
Date: Wed Jul 24 19:45:49 2013
New Revision: 1506678
URL: http://svn.apache.org/r1506678
Log:
svn merge -c 1506675 merging from trunk to branch-2 to fix YARN-968.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.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=1506678&r1=1506677&r2=1506678&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 24
19:45:49 2013
@@ -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
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.java?rev=1506678&r1=1506677&r2=1506678&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/server/api/ResourceManagerAdministrationProtocolPB.java
Wed Jul 24 19:45:49 2013
@@ -25,7 +25,7 @@ import org.apache.hadoop.yarn.proto.Reso
@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 {
