[Pkg-mongodb-maintainers] [pkg-mongodb] 117/394: Merge branch 'upstream' with version 2.6.3
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 13:58:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit 9230af5c1cbaf9cdb1a4056f6c79875188aac4ae
Merge: 95b6264 e598e7a
Author: Antonin Kral <a.kral at bobek.cz>
Date: Fri Sep 24 19:04:14 2010 +0200
Merge branch 'upstream' with version 2.6.3
SConstruct | 2 +-
bson/bsonelement.h | 2 +-
bson/bsonobj.h | 2 +-
client/dbclient.cpp | 2 +-
client/distlock.cpp | 2 +
client/parallel.cpp | 38 +-
client/parallel.h | 7 +-
db/client.cpp | 45 +-
db/client.h | 50 +-
db/clientcursor.h | 9 +-
db/cloner.cpp | 17 +-
db/commands.h | 4 +-
db/curop.h | 5 +-
db/db.cpp | 16 +-
db/db.vcxproj | 20 +-
db/db.vcxproj.filters | 62 +-
db/db_10.sln | 4 -
db/dbcommands.cpp | 88 +-
db/dbcommands_generic.cpp | 3 +-
db/instance.cpp | 33 +-
db/lasterror.cpp | 7 +-
db/matcher.cpp | 2 +-
db/oplog.cpp | 6 +-
db/oplog.h | 2 +-
db/pdfile.cpp | 48 +-
db/pdfile.h | 6 +-
db/query.cpp | 7 +-
db/queryoptimizer.cpp | 2 +-
db/queryutil.cpp | 30 +-
db/repl.cpp | 22 +-
db/repl/consensus.cpp | 12 +
db/repl/health.cpp | 34 +-
db/repl/health.h | 2 +-
db/repl/heartbeat.cpp | 27 +-
db/repl/manager.cpp | 30 +-
db/repl/replset_commands.cpp | 18 +-
db/repl/rs.cpp | 138 +-
db/repl/rs.h | 74 +-
db/repl/rs_config.cpp | 57 +-
db/repl/rs_config.h | 13 +-
db/repl/rs_initialsync.cpp | 2 +-
db/repl/rs_member.h | 19 +-
db/repl/rs_rollback.cpp | 291 +-
db/repl/rs_sync.cpp | 122 +-
db/security_commands.cpp | 4 +-
db/stats/snapshots.cpp | 2 +-
dbtests/basictests.cpp | 2 +-
dbtests/jstests.cpp | 2 +-
doxygenConfig | 2 +-
jstests/datasize3.js | 32 +
jstests/disk/diskfull.js | 5 +-
jstests/evalc.js | 32 +
jstests/geo_circle1.js | 2 +-
jstests/geo_queryoptimizer.js | 27 +
jstests/mr_sort.js | 44 +
jstests/numberlong.js | 28 +-
jstests/remove3.js | 2 +-
jstests/remove_justone.js | 16 +
jstests/repl/repl10.js | 12 +-
jstests/repl/repl12.js | 47 +
jstests/repl/replacePeer2.js | 11 +-
jstests/repl/snapshot2.js | 47 +-
jstests/replsets/randomcommands1.js | 29 +
jstests/replsets/replset1.js | 3 +-
jstests/replsets/replset2.js | 242 +-
jstests/replsets/replset4.js | 71 +-
jstests/replsets/replset5.js | 72 +
jstests/replsets/replset_remove_node.js | 17 +-
jstests/replsets/rollback.js | 30 +-
jstests/replsets/rollback2.js | 8 +-
jstests/replsets/{rollback2.js => rollback3.js} | 413 +--
jstests/replsets/sync1.js | 353 +--
jstests/replsets/two_initsync.js | 93 +
jstests/sharding/features3.js | 2 +-
jstests/sharding/shard3.js | 20 +-
rpm/mongo.spec | 2 +-
s/chunk.cpp | 21 +-
s/chunk.h | 5 +-
s/d_logic.cpp | 4 +-
s/d_logic.h | 2 +-
s/d_migrate.cpp | 6 +-
s/d_split.cpp | 16 +-
s/d_state.cpp | 11 +-
s/s_only.cpp | 5 +-
s/shardconnection.cpp | 23 +-
s/strategy_shard.cpp | 4 +-
s/util.h | 3 +
scripting/engine.cpp | 4 +-
scripting/engine_spidermonkey.cpp | 3 +-
scripting/sm_db.cpp | 49 +-
scripting/v8_db.cpp | 22 +-
shell/collection.js | 7 +-
shell/mongo_vstudio.cpp | 3532 +++++++++++------------
shell/servers.js | 26 +-
shell/shell_utils.cpp | 2 +-
tools/stat.cpp | 2 +-
util/concurrency/mutex.h | 2 +-
util/concurrency/task.cpp | 11 +-
util/concurrency/vars.cpp | 4 +-
util/goodies.h | 8 +-
util/log.cpp | 6 +-
util/log.h | 77 +-
util/message.cpp | 41 +-
util/message.h | 34 +-
util/mmap.h | 4 +-
util/mongoutils/README | 12 +-
util/optime.h | 2 +-
util/sock.h | 15 +-
util/util.cpp | 20 +-
util/version.cpp | 29 +-
util/version.h | 2 +-
111 files changed, 4172 insertions(+), 2896 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list