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

[Jonas Genannt]

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

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

commit cbdf02119324e465c1b112a560995c4bfd47a54e
Merge: f01a8a9 26afad1
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Sun Feb 1 19:38:04 2015 +0100

    Merge tag 'upstream/2.0.6'
    
    Upstream version 2.0.6
    
    # gpg: Signature made Sun 01 Feb 2015 07:38:04 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/2.0.6':
      Imported Upstream version 2.0.6

 CHANGES.md                                     |  26 +++++++
 README.md                                      |  12 ++-
 bin/eyaml                                      |  17 ++++-
 checksums.yaml.gz                              | Bin 270 -> 0 bytes
 lib/hiera/backend/eyaml.rb                     |   3 +-
 lib/hiera/backend/eyaml/CLI.rb                 |   4 +-
 lib/hiera/backend/eyaml/encryptor.rb           |   4 +
 lib/hiera/backend/eyaml/encryptors/pkcs7.rb    |   2 +-
 lib/hiera/backend/eyaml/options.rb             |  14 ++--
 lib/hiera/backend/eyaml/subcommand.rb          |  26 +++++--
 lib/hiera/backend/eyaml/subcommands/edit.rb    |  49 +++++++++++--
 lib/hiera/backend/eyaml/subcommands/version.rb |  10 +--
 lib/hiera/backend/eyaml/utils.rb               |  82 ++++++++++++++++-----
 metadata.yml                                   |  97 ++++++++++++++-----------
 tools/regem.sh                                 |   2 +-
 15 files changed, 249 insertions(+), 99 deletions(-)

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