[DRE-commits] [nanoc] 01/03: Merge tag 'upstream/4.2.3'

[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 2ac893f618320965804160d927c828cd284d2b31
Merge: aabb4ac 35ab471
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jul 3 18:49:21 2016 +0200

    Merge tag 'upstream/4.2.3'
    
    Upstream version 4.2.3
    
    # gpg: Signature faite le dim. 03 juil. 2016 18:49:16 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.lock                                       |  2 +-
 NEWS.md                                            | 12 ++++++++++++
 lib/nanoc.rb                                       |  3 +++
 lib/nanoc/base/checksummer.rb                      |  2 --
 lib/nanoc/base/compilation/compiler.rb             |  3 ++-
 lib/nanoc/base/compilation/outdatedness_checker.rb |  2 +-
 lib/nanoc/base/memoization.rb                      | 18 ++++++++++++++++--
 lib/nanoc/base/plugin_registry.rb                  |  4 +---
 lib/nanoc/base/views/item_rep_view.rb              |  4 ++++
 lib/nanoc/base/views/mixins/document_view_mixin.rb |  4 ++++
 lib/nanoc/base/views/post_compile_item_view.rb     |  7 ++++++-
 lib/nanoc/base/views/view.rb                       |  4 ++++
 lib/nanoc/version.rb                               |  2 +-
 test/base/test_compiler.rb                         | 15 ---------------
 test/base/test_memoization.rb                      | 22 ++++++++++++++++++++++
 15 files changed, 77 insertions(+), 27 deletions(-)

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