[Pkg-mongodb-maintainers] [pkg-mongodb] 160/394: Merge commit 'upstream/1.8.2'

[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 fefb1e355f6cbe35160f2f73ed68a38d95fa59a2
Merge: d95b46b 64b33ee
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Sat Jun 18 21:24:54 2011 +0200

    Merge commit 'upstream/1.8.2'

 client/clientOnly.cpp                            |   4 +
 client/connpool.cpp                              |   3 +
 client/dbclient.cpp                              |   7 +-
 client/dbclient.h                                |  19 +++-
 client/dbclient_rs.cpp                           |  56 +++++++----
 client/dbclient_rs.h                             |   3 +-
 client/examples/clientTest.cpp                   |  22 ++++
 db/btree.cpp                                     |   2 -
 db/cmdline.cpp                                   |  15 +++
 db/commands.cpp                                  |   2 -
 db/commands/distinct.cpp                         |   2 +-
 db/commands/mr.cpp                               |  13 ++-
 db/cursor.h                                      |   2 +
 db/db.cpp                                        |  13 ---
 db/dbcommands.cpp                                |  21 +++-
 db/dur_commitjob.cpp                             |  13 ++-
 db/geo/2d.cpp                                    |   7 ++
 db/index.cpp                                     |   1 -
 db/instance.cpp                                  |   2 +-
 db/lasterror.cpp                                 |   4 +-
 db/query.cpp                                     |   2 +-
 db/queryoptimizer.cpp                            |   3 +-
 db/queryoptimizer.h                              |   3 +-
 db/repl/consensus.cpp                            |   6 ++
 db/repl/manager.cpp                              |   3 +
 db/repl/replset_commands.cpp                     |   4 +-
 db/repl/rs.cpp                                   |   2 +-
 db/repl/rs.h                                     |   4 +-
 db/repl/rs_member.h                              |   4 +-
 db/update.cpp                                    |   2 +-
 dbtests/queryoptimizertests.cpp                  |   2 -
 dbtests/spin_lock_test.cpp                       |  12 ++-
 doxygenConfig                                    |   2 +-
 jstests/check_shard_index.js                     |   5 +
 jstests/mr_undef.js                              |  22 ++++
 jstests/or5.js                                   |   4 +
 jstests/replsets/auth1.js                        |  12 +++
 jstests/replsets/initial_sync1.js                |   5 +-
 jstests/sharding/multi_mongos2a.js               |  31 ++++++
 jstests/sharding/shard_insert_getlasterror_w2.js |   4 +-
 rpm/mongo.spec                                   |   2 +-
 s/balance.cpp                                    |  17 ++--
 s/balancer_policy.cpp                            |   8 ++
 s/chunk.cpp                                      |  88 ++++++++--------
 s/chunk.h                                        |  12 +--
 s/client.cpp                                     |   8 +-
 s/client.h                                       |   5 +-
 s/commands_admin.cpp                             |  22 +++-
 s/commands_public.cpp                            |   4 +
 s/config.cpp                                     |   4 +-
 s/d_logic.cpp                                    |   1 +
 s/d_migrate.cpp                                  | 123 +++++++++++++++++------
 s/d_split.cpp                                    |   8 ++
 s/d_state.cpp                                    |   4 +-
 s/grid.cpp                                       |   6 ++
 s/grid.h                                         |   2 +
 s/shard.cpp                                      |  96 +++++++++++-------
 s/shard_version.cpp                              |   6 +-
 s/strategy_shard.cpp                             |   6 +-
 s/strategy_single.cpp                            |   2 +-
 s/writeback_listener.cpp                         |  17 ++--
 s/writeback_listener.h                           |  24 ++++-
 scripting/engine.cpp                             |   4 +-
 shell/shell_utils.cpp                            |   2 +-
 tools/dump.cpp                                   |   2 +
 tools/tool.cpp                                   |  12 +--
 util/assert_util.cpp                             |   1 +
 util/concurrency/spin_lock.h                     |  10 ++
 util/concurrency/value.h                         |  35 ++++---
 util/concurrency/vars.cpp                        |   2 +
 util/message.cpp                                 |  45 ++++-----
 util/ramlog.h                                    |   3 +-
 util/sock.h                                      |   4 +-
 util/version.cpp                                 |  42 +++++++-
 74 files changed, 682 insertions(+), 288 deletions(-)

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