This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.


    from a949562  Merge staging/1.1.0 changes back to master.
     add b4fa40a  GUACAMOLE-852: Support either MySQL or MariaDB JDBC drivers.
     new 9fdcccf  GUACAMOLE-852: Merge support for selecting either MySQL or 
MariaDB JDBC drivers.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../mysql/MySQLAuthenticationProviderModule.java   | 31 +++++++++++++++++++--
 .../mysql/{package-info.java => MySQLDriver.java}  | 19 +++++++++++--
 .../guacamole/auth/mysql/MySQLDriverProperty.java} | 32 ++++++++++------------
 .../guacamole/auth/mysql/MySQLEnvironment.java     | 24 ++++++++++++++++
 .../auth/mysql/MySQLGuacamoleProperties.java       | 11 ++++++++
 5 files changed, 93 insertions(+), 24 deletions(-)
 copy 
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/{package-info.java
 => MySQLDriver.java} (79%)
 copy 
extensions/{guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/MemberAttributeTypeProperty.java
 => 
guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLDriverProperty.java}
 (57%)

Reply via email to