[mongo-java-driver] 01/02: Merge tag 'upstream/2.11.4'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository mongo-java-driver.

commit f8b7a49270a52f4220e9ec77cddd7e6a878a9bad
Merge: 9338fc9 62924d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Feb 21 01:43:42 2014 +0100

    Merge tag 'upstream/2.11.4'
    
    Upstream version 2.11.4

 build.properties                            |  4 +-
 pom.xml                                     |  2 +-
 src/main/com/mongodb/DBTCPConnector.java    |  2 +-
 src/main/com/mongodb/Mongo.java             |  2 +-
 src/main/org/bson/BasicBSONEncoder.java     | 68 ++++++++++++++++-------------
 src/test/com/mongodb/DBCollectionTest.java  | 21 ++++++---
 src/test/com/mongodb/DBPortTest.java        |  5 +++
 src/test/com/mongodb/DBTests.java           |  8 ----
 src/test/com/mongodb/JavaClientTest.java    | 17 ++++++++
 src/test/org/bson/BasicBSONEncoderTest.java | 25 ++++++++++-
 10 files changed, 103 insertions(+), 51 deletions(-)

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