Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
* master:
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release HikariCP-1.3.7
  Remove redundant assignment.
  Eliminate double-execution of shutdown code.
  Updated change log
  Updated change log
  Fix typo bug in JNDI factory class ... reflect properties from HikariConfig instead of HikariPool.
  Add a test for PropertyBeanSetter.getPropertyNames().
  Add a JNDI factory to create datasources for Tomcat users.
  This fixes #65 as well as correcting OSGi manifest generation warnings by reorganizing the code and packages somewhat to ensure that the publicly exported com.zaxxer.hikari package does not expose any internal classes.
  Fix isConnectionAlive() check when using Connection.isValid().  Clarify logging.
  Fix issue #63 improper setting of null state during connection failure.
  [maven-release-plugin] prepare for next development iteration
  Update TODO.md
  Update maven version.
  Update README.md

Conflicts:
	README.md
	pom.xml
  • Loading branch information
brettwooldridge committed Apr 28, 2014
1 parent ace19c7 commit 4cb3602
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ There is nothing faster. There is nothing more correct. HikariCP is a "zero-ov
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>1.3.6</version>
<version>1.3.7</version>
<scope>compile</scope>
</dependency>
```
Expand Down

0 comments on commit 4cb3602

Please sign in to comment.