[Pkg-mongodb-maintainers] [pkg-mongodb] 202/394: Merge tag 'upstream/2.0.4'

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit f4cdad7de83b306b815e03435883794423b7a010
Merge: 4bf7000 eaaa7b3
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Fri Mar 30 21:40:47 2012 +0200

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4

 SConstruct                 | 27 ++-------------
 buildscripts/utils.py      | 23 +++++++++++++
 client/connpool.cpp        |  2 +-
 db/dur_journal.cpp         |  2 +-
 db/oplog.cpp               |  8 ++---
 db/ops/query.cpp           | 14 ++++++++
 db/repl/rs.cpp             |  9 +++--
 dbtests/threadedtests.cpp  | 85 ++++++++++++++++++++++++++++++++++++++++++++++
 doxygenConfig              |  2 +-
 jstests/getlog2.js         | 41 ++++++++++++++++++++++
 jstests/sharding/shard3.js |  8 ++++-
 rpm/mongo.spec             |  2 +-
 s/d_chunk_manager.cpp      |  2 +-
 s/d_logic.h                |  3 ++
 s/d_state.cpp              | 28 +++++++++++++--
 s/shardconnection.cpp      |  2 +-
 shell/collection.js        |  2 +-
 shell/dbshell.cpp          |  5 ++-
 util/goodies.h             | 55 +++++++++++++++++++++---------
 util/version.cpp           |  2 +-
 20 files changed, 261 insertions(+), 61 deletions(-)

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