[DRE-commits] [ruby-rspec] 02/08: Merge tag 'upstream/3.3.0c2e1m2s0'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rspec.

commit ee9b82165eeb0d18792770226d25352f4c5e116a
Merge: 4819da6 0502b28
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jul 27 08:12:20 2015 +0200

    Merge tag 'upstream/3.3.0c2e1m2s0'
    
    Upstream version 3.3.0c2e1m2s0
    
    # gpg: Signature made lun. 27 juil. 2015 08:12:19 CEST
    # gpg:                using RSA key 0x89AF82B739CD217A
    # gpg: Good signature from "Cédric Boutillier <boutil at debian.org>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at upmc.fr>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at polytechnique.org>" [ultimate]
    # gpg:                 aka "Cédric Boutillier <cedric.boutillier at gmail.com>" [ultimate]
    # Primary key fingerprint: 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #      Subkey fingerprint: 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 rspec-core/Changelog.md                            | 19 ++++++
 .../aggregating_failures.feature                   | 32 +++++-----
 rspec-core/lib/rspec/core/example.rb               |  1 +
 rspec-core/lib/rspec/core/formatters.rb            |  2 +-
 .../rspec/core/formatters/exception_presenter.rb   |  8 ++-
 .../lib/rspec/core/formatters/html_formatter.rb    |  2 +-
 rspec-core/lib/rspec/core/version.rb               |  2 +-
 rspec-core/maintenance-branch                      |  2 +-
 rspec-core/rspec-core.gemspec                      |  2 +-
 rspec-core/spec/rspec/core/bisect/server_spec.rb   | 13 ++--
 .../formatters/documentation_formatter_spec.rb     |  2 +
 .../spec/rspec/core/formatters/html_formatted.html | 30 ++++++---
 .../core/formatters/progress_formatter_spec.rb     |  2 +-
 rspec-core/spec/rspec/core/formatters_spec.rb      | 13 ++++
 .../spec/rspec/core/resources/formatter_specs.rb   |  8 +++
 rspec-core/spec/rspec/core/suite_hooks_spec.rb     | 24 +++++++
 rspec-core/spec/support/formatter_support.rb       | 16 ++++-
 rspec-expectations/Changelog.md                    | 12 ++++
 .../features/aggregating_failures.feature          |  2 +-
 .../features/built_in_matchers/comparisons.feature | 24 ++++++-
 .../lib/rspec/expectations/version.rb              |  2 +-
 .../lib/rspec/matchers/built_in/be.rb              |  2 +
 .../lib/rspec/matchers/built_in/respond_to.rb      |  2 +-
 rspec-expectations/maintenance-branch              |  2 +-
 .../spec/rspec/matchers/built_in/be_spec.rb        | 53 ++++++++++++++++
 .../rspec/matchers/built_in/respond_to_spec.rb     |  7 +++
 rspec-mocks/Changelog.md                           | 27 +++++++-
 rspec-mocks/lib/rspec/mocks/mutex.rb               | 73 ++++++++++++++++++++++
 rspec-mocks/lib/rspec/mocks/proxy.rb               |  2 +-
 rspec-mocks/lib/rspec/mocks/reentrant_mutex.rb     | 53 ++++++++++++++++
 rspec-mocks/lib/rspec/mocks/space.rb               | 49 ++++++++++-----
 rspec-mocks/lib/rspec/mocks/verifying_proxy.rb     | 24 +++++--
 rspec-mocks/lib/rspec/mocks/version.rb             |  2 +-
 rspec-mocks/maintenance-branch                     |  2 +-
 rspec-mocks/rspec-mocks.gemspec                    |  1 +
 rspec-mocks/spec/rspec/mocks/diffing_spec.rb       |  4 ++
 .../spec/rspec/mocks/partial_double_spec.rb        | 32 ++++++++++
 .../spec/rspec/mocks/reentrant_mutex_spec.rb       | 30 +++++++++
 rspec-mocks/tmp/.gitkeep                           |  0
 39 files changed, 515 insertions(+), 68 deletions(-)

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