Updated Branches: refs/heads/trunk 462c6432d -> c25d5ad3a
Revert "AMBARI-3052. After NameNode HA is enabled, hide the button to enable it in Admin > High Availability. (akovalenko via yusaku)" This reverts commit 43283406cb228970e7da0d2a67155ab5afe4415b. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c25d5ad3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c25d5ad3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c25d5ad3 Branch: refs/heads/trunk Commit: c25d5ad3a198faaf63e473376e621806d14a6c2f Parents: 462c643 Author: Yusaku Sako <[email protected]> Authored: Thu Aug 29 18:43:17 2013 +0300 Committer: Yusaku Sako <[email protected]> Committed: Thu Aug 29 18:43:17 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 6 +----- ambari-web/app/data/HDP2/global_properties.js | 2 +- ambari-web/app/data/global_properties.js | 2 +- ambari-web/app/messages.js | 2 -- ambari-web/app/views/main/admin/highAvailability_view.js | 4 +--- 5 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c25d5ad3/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index b46e6eb..6ed35b3 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -17,7 +17,7 @@ */ var App = require('app'); -var numberUtils = require('utils/number_utils'); + /** * By Step 7, we have the following information stored in App.db and set on this * controller by the router. @@ -42,10 +42,6 @@ App.WizardStep7Controller = Em.Controller.extend({ miscModalVisible: false, //If miscConfigChange Modal is shown - gangliaAvailableSpace: null, - - gangliaMoutDir:'/', - isSubmitDisabled: function () { return (!this.stepConfigs.filterProperty('showConfig', true).everyProperty('errorCount', 0) || this.get("miscModalVisible")); }.property('[email protected]', 'miscModalVisible'), http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c25d5ad3/ambari-web/app/data/HDP2/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js index 9d770bb..a52672e 100644 --- a/ambari-web/app/data/HDP2/global_properties.js +++ b/ambari-web/app/data/HDP2/global_properties.js @@ -2330,7 +2330,7 @@ module.exports = { "id": "puppet var", "name": "rrdcached_base_dir", - "displayName": "Ganglia rrdcached base directory", + "displayName": "Ganglia rrd cached base directory", "description": "Default directory for saving the rrd files on ganglia server", "defaultValue": "/var/lib/ganglia/rrds", "displayType": "directory", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c25d5ad3/ambari-web/app/data/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js index 463fdd9..c6c7dd7 100644 --- a/ambari-web/app/data/global_properties.js +++ b/ambari-web/app/data/global_properties.js @@ -2784,7 +2784,7 @@ module.exports = { "id": "puppet var", "name": "rrdcached_base_dir", - "displayName": "Ganglia rrdcached base directory", + "displayName": "Ganglia rrd cached base directory", "description": "Default directory for saving the rrd files on ganglia server", "defaultValue": "/var/lib/ganglia/rrds", "displayType": "directory", http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c25d5ad3/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 3890034..54ddc2f 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -438,8 +438,6 @@ Em.I18n.translations = { 'installer.step7.ConfigErrMsg.message':'Error in custom configuration. Some properties entered in the box are already exposed on this page', 'installer.step7.popup.currentValue':'Current Value', 'installer.step7.popup.adjustedValue':'Adjusted Value', - 'installer.step7.popup.rddWarning.header':'Warning: disk space low on {0}', - 'installer.step7.popup.rddWarning.body':'A minimum of 16GB is recommended for the Ganglia Server logs but the disk mount "{0}" on {1} does not have enough space ({2} free). Go to the Misc tab and change Ganglia rrdcached base directory with more than 16GB of disk space. If you proceed without changing it, {1} will likely run out of disk space and become inoperable.', 'installer.step8.header':'Review', 'installer.step8.body':'Please review the configuration before installation', http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c25d5ad3/ambari-web/app/views/main/admin/highAvailability_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/highAvailability_view.js b/ambari-web/app/views/main/admin/highAvailability_view.js index c8d4cfa..89e8cac 100644 --- a/ambari-web/app/views/main/admin/highAvailability_view.js +++ b/ambari-web/app/views/main/admin/highAvailability_view.js @@ -25,8 +25,6 @@ App.MainAdminHighAvailabilityView = Em.View.extend({ this.get('controller').setSecurityStatus(); }, - isHighAvailabilityEnabled: function () { - return !App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE'); - }.property() + isHighAvailabilityEnabled: false //todo: real check });
