[DRE-commits] [ruby-mongo] 01/04: Merge tag 'upstream/2.4.1'

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ruby-mongo.

commit 9557f9d15d05175f0556acd2c93482fd034a82e6
Merge: a9e339f 31d0954
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed Dec 21 15:01:12 2016 +0200

    Merge tag 'upstream/2.4.1'
    
    Upstream version 2.4.1
    
    # gpg: Signature made Τετ 21 Δεκ 2016 03:01:12 μμ EET
    # gpg:                using RSA key 3E02FD6656295952110BAB99F51B18C720248224
    # gpg:                issuer "apoikos at debian.org"
    # gpg: Good signature from "Apollon Oikonomopoulos <apoikos at dmesg.gr>" [ultimate]
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at gmail.com>" [ultimate]
    # gpg:                 aka "Apollon Oikonomopoulos <apoikos at debian.org>" [ultimate]

 checksums.yaml.gz.sig                            | Bin 256 -> 256 bytes
 data.tar.gz.sig                                  | Bin 256 -> 256 bytes
 lib/mongo/collection.rb                          |  14 +-
 lib/mongo/collection/view.rb                     |  11 +-
 lib/mongo/collection/view/aggregation.rb         |   4 +-
 lib/mongo/collection/view/builder/map_reduce.rb  |  14 +-
 lib/mongo/collection/view/iterable.rb            |   2 +-
 lib/mongo/collection/view/map_reduce.rb          |   4 +-
 lib/mongo/collection/view/readable.rb            |  52 +--
 lib/mongo/collection/view/writable.rb            |  38 +--
 lib/mongo/index/view.rb                          |   3 +-
 lib/mongo/uri.rb                                 |   9 +-
 lib/mongo/version.rb                             |   2 +-
 metadata.gz.sig                                  | Bin 256 -> 256 bytes
 mongo.gemspec                                    |   2 +-
 spec/mongo/collection/view/aggregation_spec.rb   |  32 +-
 spec/mongo/collection/view/map_reduce_spec.rb    | 124 ++++++-
 spec/mongo/collection/view/readable_spec.rb      | 208 +++++++++++-
 spec/mongo/collection/view/writable_spec.rb      | 403 ++++++++++++++++++++++-
 spec/mongo/collection_spec.rb                    |  87 ++---
 spec/mongo/sdam_spec.rb                          |  27 +-
 spec/mongo/uri_spec.rb                           |  25 ++
 spec/spec_helper.rb                              |   6 +-
 spec/support/sdam/rs/primary_mismatched_me.yml   |   4 +-
 spec/support/sdam/rs/secondary_mismatched_me.yml |   4 +-
 25 files changed, 923 insertions(+), 152 deletions(-)

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