[DRE-commits] [ruby-rspec-core] 06/07: Merge tag 'upstream/2.14.5'

[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-core.

commit ca9b07e1391c3379f65a60b6e3d910d9e032637f
Merge: db62978 c121f57
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 15 19:31:19 2013 +0200

    Merge tag 'upstream/2.14.5'
    
    Upstream version 2.14.5
    
    # gpg: Signature faite le jeu. 15 août 2013 19:31:19 CEST avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 Changelog.md                                      |   15 +++++++++++
 lib/rspec/core/example_group.rb                   |   14 ++--------
 lib/rspec/core/formatters/json_formatter.rb       |    2 --
 lib/rspec/core/hooks.rb                           |   29 ++++++++++++++++++---
 lib/rspec/core/shared_example_group.rb            |   25 +++++++++---------
 lib/rspec/core/version.rb                         |    2 +-
 lib/rspec/core/world.rb                           |    2 +-
 metadata.yml                                      |   10 +++----
 spec/rspec/core/example_group_spec.rb             |   16 +++++++++---
 spec/rspec/core/formatters/json_formatter_spec.rb |    5 ++++
 spec/rspec/core/shared_example_group_spec.rb      |   28 ++++++++++++++++++--
 11 files changed, 106 insertions(+), 42 deletions(-)

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