From 4cb3602ad91b2026e12b83e34d8222f715517af5 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Mon, 28 Apr 2014 11:31:45 +0900
Subject: [PATCH] Merge branch 'master' into dev

* 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
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 05cec747..d81f2c8e 100644
--- a/README.md
+++ b/README.md
@@ -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>
 ```