Merge branch 'develop' of https://github.com/mariadb-corporation/mari… · mariadb-corporation/mariadb-connector-j@8e82bc5 · GitHub

Commit

Merge branch 'develop' of https://github.com/mariadb-corporation/mari…

Browse files

…adb-connector-j into develop

� Conflicts:
�	src/test/java/org/mariadb/jdbc/CancelTest.java
�	src/test/java/org/mariadb/jdbc/failover/MonoServerFailoverTest.java

Loading branch information

rusher committed Sep 14, 2020

2 parents e5f3405 + 5bf84cc commit 8e82bc5