Merge branch '2.3.x' into dev

* 2.3.x: Updates changes log.
10 years ago · 1faf28174e
parent 2ccf375ed8 6d8bfdb5ea
commit 1faf28174e
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -3,11 +3,13 @@ HikariCP Changes
 Changes in 2.4.0

 * Consolidated distribution into single JVM target (Java 7).  Java 6 support has
-   entered maintenance mode and bug fixes will continue on the 2.3.x branch.
+   entered maintenance mode, bug fixes will continue on the 2.3.x branch.

 * Pool configuration properties and DataSource methods previously marked as
   @Deprecated have been removed.

+Changes in 2.3.6
+
 * Allow explicit definition of driverClassName to override DriverManager.getDriver(url)
   located driver.