You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/02/12 18:56:39 UTC

git commit: AMBARI-4635. "SNN Process" alert displays after HA enabled successfully (alexantonenko)

Updated Branches:
  refs/heads/trunk 4a3174702 -> c14a483bd


AMBARI-4635. "SNN Process" alert displays after HA enabled successfully (alexantonenko)


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

Branch: refs/heads/trunk
Commit: c14a483bd2a93be895af1a0fa3d7d142fdb9d980
Parents: 4a31747
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Feb 12 19:53:38 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed Feb 12 19:56:19 2014 +0200

----------------------------------------------------------------------
 .../controllers/main/admin/highAvailability/step9_controller.js  | 2 +-
 ambari-web/app/messages.js                                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c14a483b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
index b2f8268..b41b0e9 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step9_controller.js
@@ -24,7 +24,7 @@ App.HighAvailabilityWizardStep9Controller = App.HighAvailabilityProgressPageCont
 
   isHA: true,
 
-  commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'reconfigureHBase', 'startAllServices', 'deleteSNameNode'],
+  commands: ['startSecondNameNode', 'installZKFC', 'startZKFC', 'reconfigureHBase', 'deleteSNameNode', 'startAllServices'],
 
   hbaseSiteTag: "",
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c14a483b/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 69b85c6..0a967c5 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -769,8 +769,8 @@ Em.I18n.translations = {
   'admin.highAvailability.wizard.step9.task1.title':'Install Failover Controllers',
   'admin.highAvailability.wizard.step9.task2.title':'Start Failover Controllers',
   'admin.highAvailability.wizard.step9.task3.title':'Reconfigure HBase',
-  'admin.highAvailability.wizard.step9.task4.title':'Start All Services',
-  'admin.highAvailability.wizard.step9.task5.title':'Delete Secondary NameNode',
+  'admin.highAvailability.wizard.step9.task4.title':'Delete Secondary NameNode',
+  'admin.highAvailability.wizard.step9.task5.title':'Start All Services',
   'admin.highAvailability.wizard.step9.notice.completed':'NameNode HA has been enabled successfully.',
 
   'admin.highAvailability.wizard.step3.curNameNode': '<b>Current NameNode:</b> ',