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-12996 Test connection for SQLA fails on Ambari UI even after db is created. (ababiichuk)
Date Thu, 03 Sep 2015 13:56:30 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 48468db6b -> e85855eeb


AMBARI-12996 Test connection for SQLA fails on Ambari UI even after db is created. (ababiichuk)


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

Branch: refs/heads/branch-2.1
Commit: e85855eebf34f63fe90ea8731d89e3e58ad6e042
Parents: 48468db
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Thu Sep 3 16:53:54 2015 +0300
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Thu Sep 3 16:56:27 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/views/common/controls_view.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e85855ee/ambari-web/app/views/common/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/controls_view.js b/ambari-web/app/views/common/controls_view.js
index ac2fa9a..4f87279 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -1128,8 +1128,8 @@ App.CheckDBConnectionView = Ember.View.extend({
       OOZIE: ['oozie.db.schema.name', 'oozie.service.JPAService.jdbc.username', 'oozie.service.JPAService.jdbc.password',
'oozie.service.JPAService.jdbc.driver', 'oozie.service.JPAService.jdbc.url'],
       HIVE: ['ambari.hive.db.schema.name', 'javax.jdo.option.ConnectionUserName', 'javax.jdo.option.ConnectionPassword',
'javax.jdo.option.ConnectionDriverName', 'javax.jdo.option.ConnectionURL'],
       KERBEROS: ['kdc_host'],
-      RANGER: App.get('isHadoop23Stack') ? ['db_root_user', 'db_root_password', 'db_name',
'ranger.jpa.jdbc.url', 'ranger.jpa.jdbc.driver'] :
-          ['db_root_user', 'db_root_password', 'db_name', 'ranger_jdbc_connection_url', 'ranger_jdbc_driver']
+      RANGER: App.get('isHadoop23Stack') ? ['db_user', 'db_password', 'db_name', 'ranger.jpa.jdbc.url',
'ranger.jpa.jdbc.driver'] :
+          ['db_user', 'db_password', 'db_name', 'ranger_jdbc_connection_url', 'ranger_jdbc_driver']
     };
     return propertiesMap[this.get('parentView.service.serviceName')];
   }.property('App.isHadoop23Stack'),
@@ -1139,8 +1139,8 @@ App.CheckDBConnectionView = Ember.View.extend({
       db_connection_url: /jdbc\.url|connection_url|connectionurl|kdc_host/ig
     };
     if (this.get('parentView.service.serviceName') != "KERBEROS") {
-      patterns.user_name = /(username|dblogin|root_user)$/ig;
-      patterns.user_passwd = /(dbpassword|password|root_password)$/ig;
+      patterns.user_name = /(username|dblogin|db_user)$/ig;
+      patterns.user_passwd = /(dbpassword|password|db_password)$/ig;
     }
     return patterns;
   }.property('parentView.service.serviceName'),


Mime
View raw message