Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 2ce347419 -> 50eb7ca51


AMBARI-15771: After enabling NN HA with HAWQ installed, duplicate properties 
are seen on HAWQ config tab (Goutam Tadi via mithmatt)


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

Branch: refs/heads/branch-2.2
Commit: 50eb7ca51b455c97bcda5276cb246cef896f8813
Parents: 2ce3474
Author: Matt <mmat...@pivotal.io>
Authored: Fri Apr 8 10:54:17 2016 -0700
Committer: Matt <mmat...@pivotal.io>
Committed: Fri Apr 8 10:54:17 2016 -0700

----------------------------------------------------------------------
 .../nameNode/step9_controller.js                | 23 +++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/50eb7ca5/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
----------------------------------------------------------------------
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
index d004ba1..24677e4 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step9_controller.js
@@ -118,19 +118,16 @@ App.HighAvailabilityWizardStep9Controller = 
App.HighAvailabilityProgressPageCont
 
   reconfigureHawq: function () {
     var data = this.get('content.serviceConfigProperties');
-    var reconfigureFiles = ['hawq-site', 'hdfs-client'];
-    reconfigureFiles.forEach(function (fileName) {
-      var configData = this.reconfigureSites([fileName], data, 
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
 false)));
-      App.ajax.send({
-        name: 'common.service.configurations',
-        sender: this,
-        data: {
-          desired_config: configData
-        },
-        success: 'saveConfigTag',
-        error: 'onTaskError'
-      });
-    }, this);
+    var configData = this.reconfigureSites(['hawq-site', 'hdfs-client'], data, 
Em.I18n.t('admin.highAvailability.step4.save.configuration.note').format(App.format.role('NAMENODE',
 false)));
+    App.ajax.send({
+      name: 'common.service.configurations',
+      sender: this,
+      data: {
+        desired_config: configData
+      },
+      success: 'saveConfigTag',
+      error: 'onTaskError'
+    });
   },
 
   saveConfigTag: function () {

Reply via email to