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/04/18 06:49:30 UTC

svn commit: r1469159 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/config.js ambari-web/app/controllers/main/host/add_controller.js

Author: yusaku
Date: Thu Apr 18 04:49:29 2013
New Revision: 1469159

URL: http://svn.apache.org/r1469159
Log:
AMBARI-1964. Add ability to toggle on/off assigning masters for new hosts being added via Add Host wizard. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/config.js
    incubator/ambari/trunk/ambari-web/app/controllers/main/host/add_controller.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469159&r1=1469158&r2=1469159&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 04:49:29 2013
@@ -264,6 +264,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1964. Add ability to toggle on/off assigning masters for new hosts
+ being added via Add Host wizard. (yusaku)
+
  AMBARI-1958. Update alert icon legend on Hosts page. (yusaku)
 
  AMBARI-1955. Add ability to turn on/off HUE support. (yusaku)

Modified: incubator/ambari/trunk/ambari-web/app/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/config.js?rev=1469159&r1=1469158&r2=1469159&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/config.js Thu Apr 18 04:49:29 2013
@@ -49,6 +49,7 @@ App.supports = {
   startStopAllServices: false,
   hiveOozieExtraDatabases: false,
   multipleHBaseMasters: false,
+  addMasters: false,
   hue: false
 };
 

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/host/add_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/host/add_controller.js?rev=1469159&r1=1469158&r2=1469159&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/host/add_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/host/add_controller.js Thu Apr 18 04:49:29 2013
@@ -117,7 +117,7 @@ App.AddHostController = App.WizardContro
     console.log('AddHostController.loadServices: loaded data ', servicesInfo);
     var serviceNames = servicesInfo.filterProperty('isSelected', true).mapProperty('serviceName');
     console.log('selected services ', serviceNames);
-    this.set('content.skipMasterStep', !serviceNames.contains('HBASE') && !serviceNames.contains('ZOOKEEPER'));
+    this.set('content.skipMasterStep', (!serviceNames.contains('HBASE') && !serviceNames.contains('ZOOKEEPER')) || !App.supports.addMasters);
   },
 
   /**