[DRE-commits] [hiera-eyaml] 03/05: Merge tag 'upstream/2.1.0'

[Stig Sandbeck Mathisen]

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

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

commit d3cae95a52c66b417090b525ae4964e9f49cafdf
Merge: d1e5eab a298ccc
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Wed Jun 1 23:10:53 2016 +0200

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 .travis.yml                                    |  24 +++-
 Gemfile                                        |   5 +-
 README.md                                      |   1 +
 bin/eyaml                                      |   8 +-
 lib/hiera/backend/eyaml.rb                     |   2 +-
 lib/hiera/backend/eyaml/CLI.rb                 |   5 +-
 lib/hiera/backend/eyaml/edithelper.rb          |  72 +++++++++++
 lib/hiera/backend/eyaml/encrypthelper.rb       |  40 ++++++
 lib/hiera/backend/eyaml/encryptor.rb           |  10 +-
 lib/hiera/backend/eyaml/encryptors/pkcs7.rb    |  13 +-
 lib/hiera/backend/eyaml/highlinehelper.rb      |  24 ++++
 lib/hiera/backend/eyaml/logginghelper.rb       |  80 ++++++++++++
 lib/hiera/backend/eyaml/options.rb             |  10 +-
 lib/hiera/backend/eyaml/subcommand.rb          |   2 +-
 lib/hiera/backend/eyaml/subcommands/edit.rb    |  16 +--
 lib/hiera/backend/eyaml/subcommands/encrypt.rb |   3 +-
 lib/hiera/backend/eyaml/subcommands/version.rb |   4 +-
 lib/hiera/backend/eyaml/utils.rb               | 169 +------------------------
 metadata.yml                                   | 106 ----------------
 19 files changed, 279 insertions(+), 315 deletions(-)

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