[Pkg-mongodb-maintainers] [pkg-mongodb] 121/394: Merge commit 'upstream/1.6.5'

[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 35aec5459dccb529e2048dab299158aead4112a3
Merge: adfe9bc ed4a804
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Fri Dec 10 13:07:32 2010 +0100

    Merge commit 'upstream/1.6.5'
    
    Conflicts:
    	debian/changelog

 client/dbclient.h                               |   4 +-
 db/dbcommands.cpp                               |   2 +-
 db/dbhelpers.cpp                                |   4 ++
 db/geo/2d.cpp                                   |  68 ++++++++++++++---------
 db/instance.cpp                                 |  12 ++++
 db/namespace.cpp                                |   6 +-
 db/query.cpp                                    |   7 ++-
 db/queryutil.cpp                                |  25 +++------
 db/repl.cpp                                     |   2 +
 db/repl/connections.h                           |  25 +++++++--
 db/repl/consensus.cpp                           |  15 ++++-
 db/repl/health.cpp                              |   6 +-
 db/repl/heartbeat.cpp                           |   2 +-
 db/repl/multicmd.h                              |   2 +-
 db/repl/rs_config.cpp                           |  34 ++++++++----
 db/repl/rs_member.h                             |   6 +-
 db/repl/rs_sync.cpp                             |   9 ++-
 db/update.cpp                                   |   8 ++-
 dbtests/basictests.cpp                          |  37 +++++++++++-
 debian/files                                    |   1 +
 debian/mongodb.upstart                          |  15 +++++
 debian/preinst                                  |  37 ++++++++++++
 doxygenConfig                                   |   2 +-
 jstests/or8.js                                  |  12 ++++
 jstests/repl/mastermaster1.js                   |   8 ++-
 jstests/repl/pair3.js                           |  32 +++++++----
 jstests/sharding/features3.js                   |  19 +++++--
 jstests/sharding/shard3.js                      |   4 +-
 jstests/slowNightly/sharding_migrate_cursor1.js |  65 ++++++++++++++++++++++
 jstests/updatee.js                              |  71 ++++++++++++++++++++++++
 lib/libboost_thread-gcc41-mt-d-1_34_1.a         | Bin 0 -> 692920 bytes
 rpm/mongo.spec                                  |   2 +-
 s/balance.cpp                                   |   6 +-
 s/chunk.cpp                                     |   2 -
 s/commands_public.cpp                           |   6 +-
 s/config.cpp                                    |   7 ++-
 s/d_migrate.cpp                                 |  35 ++++++++++--
 s/grid.cpp                                      |   4 +-
 shell/mongo_vstudio.cpp                         |  37 ++++++++++--
 shell/servers.js                                |  18 +++---
 shell/shell_utils.cpp                           |   4 +-
 shell/utils.js                                  |  28 +++++++++-
 util/goodies.h                                  |  43 ++++++++++----
 util/message.cpp                                |   2 +-
 util/message.h                                  |   4 +-
 util/ntservice.cpp                              |   5 ++
 util/sock.cpp                                   |   2 +-
 util/sock.h                                     |   6 +-
 util/version.cpp                                |   2 +-
 49 files changed, 602 insertions(+), 151 deletions(-)

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