You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/08/16 19:36:43 UTC

git commit: AMBARI-2932. In installer configs page, move YARN tab before MR2 tab. (onechiporenko via yusaku)

Updated Branches:
  refs/heads/trunk b51f04229 -> 86e28b07e


AMBARI-2932. In installer configs page, move YARN tab before MR2 tab. (onechiporenko via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/86e28b07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/86e28b07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/86e28b07

Branch: refs/heads/trunk
Commit: 86e28b07ecbf6e97333a4f99bc640e492f71326a
Parents: b51f042
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Aug 16 10:36:22 2013 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Aug 16 10:36:22 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/data/service_configs.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/86e28b07/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index 6113706..5bfeff5 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -47,6 +47,7 @@ module.exports = [
     sites: ['core-site'],
     configs: []
   },
+
   {
     serviceName: 'MAPREDUCE',
     displayName: 'MapReduce',
@@ -64,20 +65,6 @@ module.exports = [
   },
 
   {
-    serviceName: 'MAPREDUCE2',
-    displayName: 'MapReduce 2',
-    filename: 'mapred-site',
-    configCategories: [
-      App.ServiceConfigCategory.create({ name: 'HistoryServer', displayName : 'History Server', hostComponentNames : ['HISTORYSERVER']}),
-      App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
-      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
-      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
-    ],
-    sites: ['global', 'mapred-site', 'mapred-queue-acls'],
-    configs: []
-  },
-
-  {
     serviceName: 'YARN',
     displayName: 'YARN',
     filename: 'yarn-site',
@@ -94,6 +81,20 @@ module.exports = [
   },
 
   {
+    serviceName: 'MAPREDUCE2',
+    displayName: 'MapReduce 2',
+    filename: 'mapred-site',
+    configCategories: [
+      App.ServiceConfigCategory.create({ name: 'HistoryServer', displayName : 'History Server', hostComponentNames : ['HISTORYSERVER']}),
+      App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
+      App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
+      App.ServiceConfigCategory.create({ name: 'AdvancedMapredSite', displayName : 'Custom mapred-site.xml', siteFileName: 'mapred-site.xml', canAddProperty: true})
+    ],
+    sites: ['global', 'mapred-site', 'mapred-queue-acls'],
+    configs: []
+  },
+
+  {
     serviceName: 'HIVE',
     displayName: 'Hive',
     filename: 'hive-site',