[DRE-commits] [ruby-hiera] 02/04: Merge tag 'upstream/1.3.1'

[Jonas Genannt]

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

hggh-guest pushed a commit to branch master
in repository ruby-hiera.

commit 932f6b4d2ea4255df98db65e7f641c3f6730b655
Merge: 572003f 7be5eca
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Mon Feb 3 20:57:48 2014 +0100

    Merge tag 'upstream/1.3.1'
    
    Upstream version 1.3.1
    
    # gpg: Signature made Mon 03 Feb 2014 08:57:44 PM CET using RSA key ID 016CFFD0
    # gpg: Good signature from "Jonas Genannt <jonas at brachium-system.net>"
    # gpg:                 aka "Jonas Genannt <jonas.genannt at capi2name.de>"
    
    * tag 'upstream/1.3.1':
      Imported Upstream version 1.3.1

 lib/hiera/backend/yaml_backend.rb      | 10 ++++--
 lib/hiera/version.rb                   |  2 +-
 metadata.yml                           | 63 ++++++++++++++++------------------
 spec/unit/backend/yaml_backend_spec.rb | 55 ++++++++++++++++++++++-------
 4 files changed, 81 insertions(+), 49 deletions(-)

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