[libpostgresql-jdbc-java] 79/93: Merge pull request #142 from davecramer/REL9_3_STABLE

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1102
in repository libpostgresql-jdbc-java.

commit 823ccf4c91a2df837cec99cda32824b9da81041e
Merge: 88b9a03 bbb6fd0
Author: Dave Cramer <dave.cramer at credativ.ca>
Date:   Sat Apr 5 17:28:30 2014 -0400

    Merge pull request #142 from davecramer/REL9_3_STABLE
    
    connectTimeout property support backpatch from Sergey Chernov

 doc/pgjdbc.xml                                     | 12 ++++++
 org/postgresql/core/PGStream.java                  | 17 +++++++-
 org/postgresql/core/v2/ConnectionFactoryImpl.java  | 18 ++++++---
 org/postgresql/core/v2/ProtocolConnectionImpl.java |  7 +++-
 org/postgresql/core/v3/ConnectionFactoryImpl.java  | 18 ++++++---
 org/postgresql/core/v3/ProtocolConnectionImpl.java |  7 +++-
 org/postgresql/test/jdbc2/ConnectTimeoutTest.java  | 45 ++++++++++++++++++++++
 org/postgresql/test/jdbc2/Jdbc2TestSuite.java      |  4 +-
 8 files changed, 110 insertions(+), 18 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git