You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/09/24 15:27:59 UTC
ambari git commit: AMBARI-13225 Moving Oozie Server hung after
Insatlling new oozie server. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 49c10612c -> 664a626e2
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/664a626e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/664a626e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/664a626e
Branch: refs/heads/trunk
Commit: 664a626e25988f596235ec4994fba1d05aeabd31
Parents: 49c1061
Author: AndriyBabiychuk <ba...@gmail.com>
Authored: Thu Sep 24 16:19:47 2015 +0300
Committer: AndriyBabiychuk <ba...@gmail.com>
Committed: Thu Sep 24 16:19:47 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/664a626e/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/664a626e/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];