Browse Source

AMBARI-2185. Rename MAPREDUCEv2 to MAPREDUCE2

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1485468 13f79535-47bb-0310-9956-ffa450edef68
Nate Cole 12 years ago
parent
commit
8d2938bebc

+ 1 - 1
ambari-agent/src/main/python/ambari_agent/AmbariConfig.py

@@ -88,7 +88,7 @@ rolesToClass = {
   'YARN_CLIENT': 'hdp-yarn::yarn_client',
   'YARN_CLIENT': 'hdp-yarn::yarn_client',
   'HDFS_CLIENT': 'hdp-hadoop::client',
   'HDFS_CLIENT': 'hdp-hadoop::client',
   'MAPREDUCE_CLIENT': 'hdp-hadoop::client',
   'MAPREDUCE_CLIENT': 'hdp-hadoop::client',
-  'MAPREDUCEv2_CLIENT': 'hdp-yarn::mapreducev2_client',
+  'MAPREDUCE2_CLIENT': 'hdp-yarn::mapreducev2_client',
   'ZOOKEEPER_SERVER': 'hdp-zookeeper',
   'ZOOKEEPER_SERVER': 'hdp-zookeeper',
   'ZOOKEEPER_CLIENT': 'hdp-zookeeper::client',
   'ZOOKEEPER_CLIENT': 'hdp-zookeeper::client',
   'HBASE_MASTER': 'hdp-hbase::master',
   'HBASE_MASTER': 'hdp-hbase::master',

+ 1 - 1
ambari-server/src/main/java/org/apache/ambari/server/Role.java

@@ -35,7 +35,7 @@ public enum Role {
   JOBTRACKER,
   JOBTRACKER,
   TASKTRACKER,
   TASKTRACKER,
   MAPREDUCE_CLIENT,
   MAPREDUCE_CLIENT,
-  MAPREDUCEv2_CLIENT,
+  MAPREDUCE2_CLIENT,
   JAVA_JCE,
   JAVA_JCE,
   HADOOP_CLIENT,
   HADOOP_CLIENT,
   JOBTRACKER_SERVICE_CHECK,
   JOBTRACKER_SERVICE_CHECK,

+ 0 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/container-executor.cfg → ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/container-executor.cfg


+ 0 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/core-site.xml → ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/core-site.xml


+ 0 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-queue-acls.xml → ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/mapred-queue-acls.xml


+ 0 - 0
ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/configuration/mapred-site.xml → ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/configuration/mapred-site.xml


+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCEv2/metainfo.xml → ambari-server/src/main/resources/stacks/HDP/2.0.1/services/MAPREDUCE2/metainfo.xml

@@ -25,7 +25,7 @@
             <category>MASTER</category>
             <category>MASTER</category>
         </component>
         </component>
         <component>
         <component>
-            <name>MAPREDUCEv2_CLIENT</name>
+            <name>MAPREDUCE2_CLIENT</name>
             <category>CLIENT</category>
             <category>CLIENT</category>
         </component>
         </component>
     </components>
     </components>