[Pkg-mongodb-maintainers] [pkg-mongodb] 50/394: Merget upstream version 1.4.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 7ded0983b2bbcf8aa6b44821247d96c99b15bd26
Merge: 47db1b5 3b11d68
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Tue Apr 27 19:39:09 2010 +0200

    Merget upstream version 1.4.2
    
    Conflicts:
    
    	debian/changelog
    	debian/control

 SConstruct                      |  6 ++---
 buildscripts/hacks_ubuntu.py    |  9 +++++--
 client/clientOnly.cpp           |  2 ++
 client/dbclient.cpp             |  2 ++
 db/btree.cpp                    | 33 +++++++++++++----------
 db/client.cpp                   | 17 ++++++++++++
 db/client.h                     |  2 ++
 db/clientcursor.cpp             |  1 +
 db/cmdline.cpp                  |  1 -
 db/curop.h                      | 10 ++++---
 db/db.cpp                       |  2 ++
 db/db.h                         |  5 +++-
 db/dbcommands.cpp               | 33 ++++++++++++++---------
 db/dbwebserver.cpp              |  5 +++-
 db/index_geo2d.cpp              | 35 ++++++++++++++++++------
 db/lasterror.cpp                | 10 +++++--
 db/pdfile.cpp                   | 16 ++++++++---
 db/repl.cpp                     |  9 +++++--
 db/repl.h                       |  5 +++-
 db/update.cpp                   | 19 ++++++++-----
 db/update.h                     | 12 ++++-----
 dbtests/basictests.cpp          |  5 +++-
 dbtests/btreetests.cpp          | 38 +++++++++++++++++++++++---
 dbtests/framework.cpp           |  2 ++
 dbtests/repltests.cpp           |  3 ++-
 doxygenConfig                   |  2 +-
 jstests/geo2.js                 |  5 ++++
 jstests/repl/basic1.js          | 34 ++++++++++++++++++++++--
 jstests/repl/snapshot3.js       |  2 +-
 jstests/update_arraymatch2.js   |  2 +-
 jstests/updated.js              | 20 ++++++++++++++
 rpm/mongo.spec                  |  2 +-
 s/server.cpp                    |  3 ++-
 scripting/engine_spidermonkey.h |  1 +
 stdafx.cpp                      |  2 +-
 tools/tool.cpp                  |  3 +++
 util/assert_util.cpp            |  1 +
 util/goodies.h                  | 59 ++++++++++++++++++++++++++---------------
 38 files changed, 317 insertions(+), 101 deletions(-)


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