ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-13225 Moving Oozie Server hung after Insatlling new oozie server. (ababiichuk)
Date Thu, 24 Sep 2015 13:29:42 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 3ca198299 -> 0dab1ce09


AMBARI-13225 Moving Oozie Server hung after Insatlling new oozie server. (ababiichuk)


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

Branch: refs/heads/branch-2.1.2
Commit: 0dab1ce09d80f3e1b22f9169c8e379cc915af5f8
Parents: 3ca1982
Author: AndriyBabiychuk <babiychukandrey@gmail.com>
Authored: Thu Sep 24 16:19:47 2015 +0300
Committer: AndriyBabiychuk <babiychukandrey@gmail.com>
Committed: Thu Sep 24 16:29:36 2015 +0300

----------------------------------------------------------------------
 .../app/controllers/main/service/reassign/step1_controller.js      | 2 +-
 .../app/controllers/main/service/reassign/step4_controller.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0dab1ce0/ambari-web/app/controllers/main/service/reassign/step1_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step1_controller.js b/ambari-web/app/controllers/main/service/reassign/step1_controller.js
index ad8c89a..d8e9f76 100644
--- a/ambari-web/app/controllers/main/service/reassign/step1_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step1_controller.js
@@ -99,7 +99,7 @@ App.ReassignMasterWizardStep1Controller = Em.Controller.extend({
     this.set('content.serviceProperties', properties);
 
     databaseProperty = properties[ this.dbProperty() ];
-    databaseType = databaseProperty.match(/MySQL|PostgreS|Oracle|Derby|MSSQL/gi)[0];
+    databaseType = databaseProperty.match(/MySQL|PostgreS|Oracle|Derby|MSSQL|Anywhere/gi)[0];
     this.set('databaseType', databaseType);
 
     if (this.get('content.reassign.component_name') == 'OOZIE_SERVER' && databaseType
!== 'derby') {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0dab1ce0/ambari-web/app/controllers/main/service/reassign/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 51de785..44dfeff 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -1077,7 +1077,7 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
   }.property(),
 
   dbType: function() {
-    var databaseTypes = /MySQL|PostgreS|Oracle|Derby|MSSQL/gi;
+    var databaseTypes = /MySQL|PostgreS|Oracle|Derby|MSSQL|Anywhere/gi;
     var databaseProp = this.get('content.serviceProperties')[this.get('dbProperty')];
 
     return databaseProp.match(databaseTypes)[0];


Mime
View raw message