[Pkg-mongodb-maintainers] [pkg-mongodb] 389/394: Merge tag 'upstream/2.6.12'

[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 e1f2f5c8bf51229df0ccc8d1963ae1592a6b8e8b
Merge: ca3d137 d2df5d4
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Jul 13 12:37:32 2016 +0300

    Merge tag 'upstream/2.6.12'
    
    Upstream version 2.6.12
    
    # gpg: Signature made Τετ 13 Ιούλ 2016 12:37:28 μμ EEST
    # gpg:                using RSA key 0xDBADC9EBEEA7C60E
    # gpg: Good signature from "Apollon Oikonomopoulos <apoikos at dmesg.gr>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at gmail.com>"
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at debian.org>"

 SConstruct                                         |  18 +-
 doxygenConfig                                      |   2 +-
 etc/evergreen.yml                                  |  25 +-
 jstests/auth/authz_modifications_access_control.js |  13 +
 jstests/core/queryoptimizer3.js                    |  37 ++-
 jstests/libs/trace_missing_docs.js                 |   4 +-
 jstests/multiVersion/upgrade_cluster_v3_to_v4.js   | 259 -------------------
 .../multiVersion/upgrade_cluster_v3_to_v4_db.js    | 245 ------------------
 .../upgrade_cluster_v3_to_v4_wait_for_mongos.js    |  74 ------
 .../upgrade_cluster_v3_to_v4_with_parallel_ops.js  | 281 ---------------------
 .../upgrade_cluster_v3_to_v4_with_stale_mongod.js  | 165 ------------
 .../dur_remove_old_journals.js                     |  84 +++---
 .../indexbg_restart_sigkill_secondary_noretry.js   |   2 +-
 .../sharding/find_and_modify_after_multi_write.js  |  56 ++++
 jstests/sharding/query_after_write.js              |  47 ++++
 jstests/slow2/cursor_timeout.js                    |  34 ++-
 rpm/mongo.mdv.spec                                 |   2 +-
 rpm/mongodb-enterprise-unstable.spec               |   4 +-
 rpm/mongodb-enterprise.spec                        |   4 +-
 rpm/mongodb-org-unstable.spec                      |   2 +-
 rpm/mongodb-org.spec                               |   2 +-
 src/mongo/base/error_codes.err                     |   1 +
 src/mongo/bson/mutable/document.cpp                |  24 ++
 src/mongo/bson/mutable/element.h                   |   6 +
 src/mongo/bson/mutable/mutable_bson_test.cpp       | 162 ++++++++++++
 src/mongo/client/parallel.cpp                      |   5 +
 src/mongo/db/commands/index_filter_commands.cpp    |  10 +
 src/mongo/db/commands/user_management_commands.cpp |   7 +
 .../db/commands/write_commands/batch_executor.cpp  |  29 ++-
 src/mongo/db/db.cpp                                |   3 +
 src/mongo/db/dur_journal.cpp                       |  88 +++++--
 src/mongo/db/dur_journal.h                         |  25 +-
 src/mongo/db/dur_journalimpl.h                     |  25 +-
 src/mongo/db/dur_preplogbuffer.cpp                 |   2 +-
 src/mongo/db/dur_recover.cpp                       |  45 +++-
 src/mongo/db/dur_recover.h                         |   9 +-
 src/mongo/db/dur_writetodatafiles.cpp              |   2 +
 src/mongo/db/exec/collection_scan.cpp              |  20 +-
 src/mongo/db/exec/collection_scan.h                |   3 +-
 src/mongo/db/ops/modifier_rename.cpp               |   6 +-
 src/mongo/db/ops/modifier_rename_test.cpp          |  49 ++++
 src/mongo/db/query/idhack_runner.cpp               |   9 +-
 src/mongo/db/query/multi_plan_runner.cpp           |  30 +--
 src/mongo/db/query/new_find.cpp                    |  53 ++--
 src/mongo/db/query/plan_enumerator.cpp             |  71 ++++--
 src/mongo/db/query/query_planner.cpp               |   2 +-
 src/mongo/db/query/query_planner_test.cpp          |  78 ++++--
 src/mongo/dbtests/querytests.cpp                   |  18 +-
 src/mongo/platform/random.cpp                      |  26 +-
 src/mongo/platform/random.h                        |  20 +-
 src/mongo/platform/random_test.cpp                 |  67 +++++
 src/mongo/s/d_migrate.cpp                          |  17 +-
 src/mongo/s/request.cpp                            |   4 +-
 src/mongo/s/request.h                              |   3 +
 src/mongo/s/server.cpp                             |   4 +-
 src/mongo/shell/shardingtest.js                    |  18 +-
 src/mongo/util/mmap.cpp                            |  11 +-
 src/mongo/util/mmap.h                              |   4 -
 src/mongo/util/net/ssl_options.cpp                 |  17 +-
 src/mongo/util/version.cpp                         |   2 +-
 60 files changed, 981 insertions(+), 1354 deletions(-)

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