[DRE-commits] [hiera] 01/05: Merge tag 'upstream/2.0.0'

[Jonas Genannt]

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

genannt pushed a commit to branch master
in repository hiera.

commit 67590f0bfc80502222bd3e0ff7e83b1b75bcd72a
Merge: 8017c8d a9111fe
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Tue Apr 28 19:01:48 2015 +0200

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0
    
    # gpg: Signature made Tue 28 Apr 2015 07:01:44 PM CEST 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>"
    # gpg:                 aka "Jonas Genannt <genannt at debian.org>"
    
    * tag 'upstream/2.0.0':
      Imported Upstream version 2.0.0
      Imported Upstream version 1.3.4

 LICENSE                                            |   2 +-
 README.md                                          |  57 +++++-
 bin/hiera                                          |  79 +++++---
 checksums.yaml.gz                                  | Bin 268 -> 268 bytes
 lib/hiera.rb                                       |  58 +++++-
 lib/hiera/backend.rb                               | 161 +++++++++++----
 lib/hiera/backend/json_backend.rb                  |  16 +-
 lib/hiera/backend/yaml_backend.rb                  |  16 +-
 lib/hiera/config.rb                                |   4 +-
 lib/hiera/interpolate.rb                           |  68 +++++--
 lib/hiera/util.rb                                  |  10 +-
 lib/hiera/version.rb                               |   2 +-
 metadata.yml                                       |  20 +-
 spec/spec_helper.rb                                |  12 ++
 spec/unit/backend/json_backend_spec.rb             |  18 +-
 spec/unit/backend/yaml_backend_spec.rb             |  35 ++--
 spec/unit/backend_spec.rb                          | 218 ++++++++++++++++++---
 spec/unit/config_spec.rb                           |  15 ++
 spec/unit/fixtures/interpolate/config/hiera.yaml   |   6 +
 spec/unit/fixtures/interpolate/data/niltest.yaml   |   2 +
 spec/unit/fixtures/interpolate/data/recursive.yaml |   3 +
 spec/unit/fixtures/override/config/hiera.yaml      |   5 +
 spec/unit/fixtures/override/data/alternate.yaml    |   1 +
 spec/unit/fixtures/override/data/common.yaml       |   2 +
 spec/unit/interpolate_spec.rb                      |  36 ++++
 spec/unit/util_spec.rb                             |   8 +-
 26 files changed, 670 insertions(+), 184 deletions(-)

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