[Pkg-mongodb-maintainers] [pkg-mongodb] 210/394: Merge tag 'upstream/2.0.6'

[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 291c9687fb2307dc22d1f269eb4d0aa98fe8cadc
Merge: 6d0f215 3703a28
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Tue Jun 5 19:50:36 2012 +0200

    Merge tag 'upstream/2.0.6'
    
    Upstream version 2.0.6

 SConstruct                                  | 10 ++--
 bson/util/builder.h                         | 49 +++++++++-------
 client/dbclient_rs.cpp                      | 27 +++++++--
 client/dbclient_rs.h                        |  5 +-
 db/cloner.cpp                               |  6 +-
 db/compact.cpp                              |  5 ++
 db/dbwebserver.cpp                          | 11 ++--
 db/queryoptimizer.cpp                       | 51 +++++++++++------
 db/queryoptimizer.h                         |  1 +
 db/repl.cpp                                 |  2 +-
 db/repl/rs_initialsync.cpp                  | 45 +++++++++++----
 db/security_common.h                        |  4 +-
 doxygenConfig                               |  2 +-
 jstests/queryoptimizer7.js                  | 24 ++++++++
 jstests/queryoptimizera.js                  | 87 +++++++++++++++++++++++++++++
 jstests/replsets/replset7.js                | 46 +++++++++++++++
 jstests/replsets/slavedelay3.js             | 38 +++++++++++++
 jstests/slowNightly/sharding_passthrough.js |  2 +-
 rpm/mongo.spec                              |  2 +-
 s/d_migrate.cpp                             | 57 +++++++++++++------
 s/d_state.cpp                               |  9 +++
 shell/utils.js                              |  3 +-
 third_party/js-1.7/jsprf.c                  |  2 +
 util/net/sock.cpp                           | 26 ++++-----
 util/version.cpp                            |  2 +-
 25 files changed, 408 insertions(+), 108 deletions(-)

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