Repository: ambari Updated Branches: refs/heads/branch-2.1 b05b3c922 -> 1232df18b
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/1232df18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1232df18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1232df18 Branch: refs/heads/branch-2.1 Commit: 1232df18bd5be09385508c21c199c8d39962dc71 Parents: b05b3c9 Author: AndriyBabiychuk <babiychukand...@gmail.com> Authored: Thu Sep 24 16:19:47 2015 +0300 Committer: AndriyBabiychuk <babiychukand...@gmail.com> Committed: Thu Sep 24 16:28:37 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/1232df18/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/1232df18/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];
