[DRE-commits] [nanoc] 01/02: Merge tag 'upstream/4.2.4'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit f55b671e963695d08fbd8847fc8132862719997a
Merge: 8dda0a4 2b3d5dd
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Aug 1 22:22:31 2016 +0200

    Merge tag 'upstream/4.2.4'
    
    Upstream version 4.2.4
    
    # gpg: Signature faite le lun. 01 août 2016 22:22:29 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 Gemfile                                           |  2 +
 Gemfile.lock                                      | 45 ++++++++++-----------
 NEWS.md                                           | 13 ++++++
 lib/nanoc.rb                                      |  1 +
 lib/nanoc/base.rb                                 |  1 +
 lib/nanoc/base/compilation/compiler.rb            |  3 +-
 lib/nanoc/base/feature.rb                         | 11 ++++++
 lib/nanoc/base/memoization.rb                     | 19 +++++----
 lib/nanoc/cli.rb                                  | 17 +-------
 lib/nanoc/cli/commands/compile.rb                 | 48 +++++++++++++++++++++--
 lib/nanoc/extra/checking/checks/internal_links.rb |  5 ++-
 lib/nanoc/rule_dsl/recording_executor.rb          |  4 ++
 lib/nanoc/rule_dsl/rule_memory_calculator.rb      | 24 ++++++++++--
 lib/nanoc/version.rb                              |  2 +-
 nanoc.gemspec                                     |  1 +
 test/base/test_compiler.rb                        | 15 +++++++
 test/extra/checking/checks/test_internal_links.rb | 15 +++++++
 17 files changed, 167 insertions(+), 59 deletions(-)

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