You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/01/26 06:06:24 UTC

[guacamole-client] branch master updated (a949562 -> 9fdcccf)

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%)


[guacamole-client] 01/01: GUACAMOLE-852: Merge support for selecting either MySQL or MariaDB JDBC drivers.

Posted by mj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 9fdcccf79d602f86fba46d5445c0f95d56efb8b4
Merge: a949562 b4fa40a
Author: Mike Jumper <mj...@apache.org>
AuthorDate: Sat Jan 25 22:06:13 2020 -0800

    GUACAMOLE-852: Merge support for selecting either MySQL or MariaDB JDBC drivers.

 .../mysql/MySQLAuthenticationProviderModule.java   | 31 +++++++++++--
 .../apache/guacamole/auth/mysql/MySQLDriver.java   | 37 +++++++++++++++
 .../guacamole/auth/mysql/MySQLDriverProperty.java  | 52 ++++++++++++++++++++++
 .../guacamole/auth/mysql/MySQLEnvironment.java     | 24 ++++++++++
 .../auth/mysql/MySQLGuacamoleProperties.java       | 11 +++++
 5 files changed, 152 insertions(+), 3 deletions(-)