[12/21] ambari git commit: AMBARI-15076: HAWQ standby host name not getting populated in warning msg (nalex via jaoki)

2016-02-22 Thread ncole 
AMBARI-15076: HAWQ standby host name not getting populated in warning msg 
(nalex via jaoki)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1ba6722d14f54910d73f4b4d8decbb9a3cb1c5d6
Parents: 2005627
Author: Jun Aoki 
Authored: Fri Feb 19 14:16:20 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 19 14:16:20 2016 -0800

--
 .../admin/highAvailability/hawq/addStandby/step3_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ba6722d/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
index 513a519..fd28ad5 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
@@ -141,7 +141,7 @@ App.AddHawqStandbyWizardStep3Controller = 
Em.Controller.extend({
   submit: function () {
 if (!this.get('isSubmitDisabled')) {
   dataDir = 
this.get('hawqProps').items[0].properties['hawq_master_directory'];
-  hawqStandby = 
this.get('hawqProps').items[0].properties['hawq_standby_address_host']
+  hawqStandby = this.get('content.hawqHosts.newHawqStandby');
   App.showConfirmationPopup(
 function() {
   
App.get('router.mainAdminKerberosController').getKDCSessionState(function() {

ambari git commit: AMBARI-15076: HAWQ standby host name not getting populated in warning msg (nalex via jaoki)

2016-02-19 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/trunk 20056273e -> 1ba6722d1


AMBARI-15076: HAWQ standby host name not getting populated in warning msg 
(nalex via jaoki)


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

Branch: refs/heads/trunk
Commit: 1ba6722d14f54910d73f4b4d8decbb9a3cb1c5d6
Parents: 2005627
Author: Jun Aoki 
Authored: Fri Feb 19 14:16:20 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 19 14:16:20 2016 -0800

--
 .../admin/highAvailability/hawq/addStandby/step3_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ba6722d/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
index 513a519..fd28ad5 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
@@ -141,7 +141,7 @@ App.AddHawqStandbyWizardStep3Controller = 
Em.Controller.extend({
   submit: function () {
 if (!this.get('isSubmitDisabled')) {
   dataDir = 
this.get('hawqProps').items[0].properties['hawq_master_directory'];
-  hawqStandby = 
this.get('hawqProps').items[0].properties['hawq_standby_address_host']
+  hawqStandby = this.get('content.hawqHosts.newHawqStandby');
   App.showConfirmationPopup(
 function() {
   
App.get('router.mainAdminKerberosController').getKDCSessionState(function() {

ambari git commit: AMBARI-15076: HAWQ standby host name not getting populated in warning msg (nalex via jaoki)

2016-02-19 Thread jaoki 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 f848cb3c6 -> 49b6ae660


AMBARI-15076: HAWQ standby host name not getting populated in warning msg 
(nalex via jaoki)


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

Branch: refs/heads/branch-2.2
Commit: 49b6ae660b80bab5a296361409b0cb869bc77cfb
Parents: f848cb3
Author: Jun Aoki 
Authored: Fri Feb 19 14:15:42 2016 -0800
Committer: Jun Aoki 
Committed: Fri Feb 19 14:15:42 2016 -0800

--
 .../admin/highAvailability/hawq/addStandby/step3_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/49b6ae66/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
index 070acc0..1801fca 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/hawq/addStandby/step3_controller.js
@@ -138,7 +138,7 @@ App.AddHawqStandbyWizardStep3Controller = 
Em.Controller.extend({
   submit: function () {
 if (!this.get('isSubmitDisabled')) {
   dataDir = 
this.get('hawqProps').items[0].properties['hawq_master_directory'];
-  hawqStandby = 
this.get('hawqProps').items[0].properties['hawq_standby_address_host']
+  hawqStandby = this.get('content.hawqHosts.newHawqStandby');
   App.showConfirmationPopup(
 function() {
   
App.get('router.mainAdminKerberosController').getKDCSessionState(function() {