[Pkg-mongodb-maintainers] [pkg-mongodb] 112/394: Merge branch 'upstream', version 1.6.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 8d9696627410cce8736c8ec80ad39f4181a2c205
Merge: 216c19b 03e58f8
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Thu Sep 2 17:40:22 2010 +0200

    Merge branch 'upstream', version 1.6.2

 client/dbclient.h                     |  21 +++++--
 db/client.cpp                         |  25 ++++++++-
 db/clientcursor.cpp                   | 102 ++++++++++++++++++++++++++--------
 db/clientcursor.h                     |  38 +++++++------
 db/cmdline.cpp                        |   2 +-
 db/curop.h                            |   8 +--
 db/database.h                         |   5 ++
 db/dbcommands.cpp                     |  39 +++----------
 db/dbcommands_generic.cpp             |   7 +++
 db/lasterror.cpp                      |  10 +---
 db/lasterror.h                        |   4 +-
 db/mr.cpp                             |  10 ++--
 db/pdfile.cpp                         |  12 +++-
 db/query.cpp                          |   6 +-
 db/repl/rs.cpp                        |   1 +
 db/replpair.h                         |   2 +-
 db/restapi.cpp                        |   4 +-
 db/scanandorder.h                     |  11 +++-
 db/update.cpp                         |   9 ++-
 doxygenConfig                         |   2 +-
 jstests/basic3.js                     |   2 +-
 jstests/basic9.js                     |   2 +-
 jstests/dbcase.js                     |   4 +-
 jstests/delx.js                       |  31 +++++++++++
 jstests/sharding/addshard2.js         |  52 +++++++++++++++++
 jstests/{ => slowNightly}/capped4.js  |   8 ++-
 jstests/{ => slowNightly}/cursor8.js  |   0
 jstests/{ => slowNightly}/recstore.js |   0
 rpm/mongo.spec                        |   2 +-
 s/commands_admin.cpp                  |  31 ++++++++---
 s/commands_public.cpp                 |   1 +
 s/grid.cpp                            | 102 ++++++++++++++++++++++++++++------
 s/grid.h                              |   7 +--
 s/server.cpp                          |   5 +-
 s/shard.cpp                           |  13 +++++
 scripting/sm_db.cpp                   |   6 +-
 shell/servers.js                      |  22 ++++++--
 util/version.cpp                      |   2 +-
 38 files changed, 445 insertions(+), 163 deletions(-)

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