Repository: ambari
Updated Branches:
  refs/heads/trunk a6f0fbfb4 -> 1fbc106b8


AMBARI-15639. Expose MariaDB option for Hive, Oozie and Ranger (rzang)


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

Branch: refs/heads/trunk
Commit: 1fbc106b88c04fe7da16491b4740b94b71130db1
Parents: a6f0fbf
Author: Richard Zang <rz...@apache.org>
Authored: Thu Mar 31 11:20:35 2016 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Thu Mar 31 11:20:55 2016 -0700

----------------------------------------------------------------------
 .../HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml  | 2 +-
 ambari-web/app/data/HDP2/site_properties.js                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1fbc106b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index 07eb7c4..b358f27 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -96,7 +96,7 @@
     <name>ranger.jpa.jdbc.driver</name>
     <value>com.mysql.jdbc.Driver</value>
     <display-name>Driver class name for a JDBC Ranger database</display-name>
-    <description>JDBC driver class name. Example: For Mysql: 
com.mysql.jdbc.Driver, For Oracle: oracle.jdbc.OracleDriver</description>
+    <description>JDBC driver class name. Example: For MySQL / MariaDB: 
com.mysql.jdbc.Driver, For Oracle: oracle.jdbc.OracleDriver</description>
     <value-attributes>
       <overridable>false</overridable>
     </value-attributes>

http://git-wip-us.apache.org/repos/asf/ambari/blob/1fbc106b/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js 
b/ambari-web/app/data/HDP2/site_properties.js
index 40676df..3586b0f 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -349,7 +349,7 @@ var hdp2properties = [
         hidden: false
       },
       {
-        displayName: 'Existing MySQL Database',
+        displayName: 'Existing MySQL / MariaDB Database',
         hidden: false
       },
       {
@@ -445,7 +445,7 @@ var hdp2properties = [
         hidden: false
       },
       {
-        displayName: 'Existing MySQL Database',
+        displayName: 'Existing MySQL / MariaDB Database',
         hidden: false
       },
       {

Reply via email to