[DRE-commits] [cucumber] 01/03: Merge tag 'upstream/1.3.16'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository cucumber.

commit 502b2b4b6c3264f7c2ad6b99bdab78f479033de7
Merge: dc9b158 5be5e13
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 13 22:38:24 2014 +0200

    Merge tag 'upstream/1.3.16'
    
    Upstream version 1.3.16
    
    # gpg: Signature faite le mer. 13 août 2014 22:38:21 CEST avec la clef RSA d'identifiant 39CD217A
    # 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> »

 History.md                                         |   7 +
 checksums.yaml.gz                                  | Bin 0 -> 269 bytes
 cucumber.gemspec                                   |   2 +-
 features/backtraces.feature                        |   4 +-
 features/json_formatter.feature                    |  72 +++++++-
 features/rerun_formatter.feature                   |   7 +
 .../formatter/gherkin_formatter_adapter.rb         |   4 +
 lib/cucumber/formatter/rerun.rb                    |  13 ++
 lib/cucumber/platform.rb                           |   2 +-
 lib/cucumber/rspec/doubles.rb                      |  15 +-
 metadata.yml                                       | 186 ++++++++-------------
 11 files changed, 184 insertions(+), 128 deletions(-)

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