[mongo-java-driver] 01/05: Merge tag 'upstream/2.12.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 1429f518dbaca0604ff2a199d5ced1bb2a6846b3
Merge: cee0ddb b391b75
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 20 15:31:59 2014 +0200

    Merge tag 'upstream/2.12.4'
    
    Upstream version 2.12.4

 build.properties                                   |   4 +-
 pom.xml                                            |   2 +-
 src/main/com/mongodb/BaseCluster.java              |  30 ++-
 src/main/com/mongodb/DBCollection.java             |   3 +-
 src/main/com/mongodb/Mongo.java                    |   2 +-
 src/main/com/mongodb/ServerDescription.java        |  48 +++-
 src/main/com/mongodb/ServerMonitor.java            |  14 +-
 src/main/com/mongodb/Tags.java                     |   2 +-
 src/test/com/mongodb/ServerDescriptionTest.java    | 267 +++++++++++++++------
 .../com/mongodb/ServerMonitorSpecification.groovy  |  61 +++--
 10 files changed, 305 insertions(+), 128 deletions(-)

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