[DRE-commits] [cucumber] 01/05: Merge tag 'upstream/1.3.17'

[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 2769086a62c4e54cad84d0b0936dcaabba8d43da
Merge: fbaedfd 6251fde
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Sep 24 10:03:33 2014 +0200

    Merge tag 'upstream/1.3.17'
    
    Upstream version 1.3.17
    
    # gpg: Signature faite le mer. 24 sept. 2014 10:03:32 CEST
    # gpg:                avec la clef RSA 0xDA4958F611E149E9
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »

 .travis.yml                                        |   2 +-
 History.md                                         |   5 +
 checksums.yaml.gz                                  | Bin 269 -> 0 bytes
 cucumber.gemspec                                   |   2 +-
 features/json_formatter.feature                    | 254 +++++++++++++++++++++
 features/step_definitions/cucumber_steps.rb        |   6 +-
 .../formatter/gherkin_formatter_adapter.rb         |  96 +++++++-
 lib/cucumber/formatter/html.rb                     |  10 +-
 lib/cucumber/formatter/json.rb                     |   2 +-
 lib/cucumber/platform.rb                           |   2 +-
 metadata.yml                                       | 182 +++++++++------
 spec/cucumber/formatter/html_spec.rb               |  33 ++-
 spec/cucumber/formatter/progress_spec.rb           |  79 +++++--
 13 files changed, 575 insertions(+), 98 deletions(-)

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