[DRE-commits] [ruby-puppet-syntax] 01/02: Merge tag 'upstream/2.1.0'

[Michael Moll]

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

mmoll-guest pushed a commit to branch master
in repository ruby-puppet-syntax.

commit 813cb683a69c43e832f38a61d7f2bc7303b76cc4
Merge: a9391a1 7009d9c
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Wed Jul 6 23:53:36 2016 +0200

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0

 .travis.yml                                        |  12 +++
 CHANGELOG                                          |   7 ++
 lib/puppet-syntax.rb                               |   2 +-
 lib/puppet-syntax/hiera.rb                         |   2 +-
 lib/puppet-syntax/manifests.rb                     |   7 +-
 lib/puppet-syntax/tasks/puppet-syntax.rb           |   6 ++
 lib/puppet-syntax/templates.rb                     |  56 +++++++++---
 lib/puppet-syntax/version.rb                       |   2 +-
 metadata.yml                                       |  18 +++-
 spec/fixtures/test_module/manifests/tag_notice.pp  |   5 ++
 spec/fixtures/test_module/templates/fail_error.epp |   3 +
 .../test_module/templates/fail_error_also.epp      |   3 +
 spec/fixtures/test_module/templates/pass.epp       |   3 +
 spec/fixtures/test_module/templates/pass_also.epp  |   3 +
 spec/puppet-syntax/hiera_spec.rb                   |  11 +--
 spec/puppet-syntax/manifests_spec.rb               | 100 +++++++++++++++------
 spec/puppet-syntax/tasks/puppet-syntax_spec.rb     |   1 +
 spec/puppet-syntax/templates_spec.rb               |  68 ++++++++++++++
 spec/puppet-syntax_spec.rb                         |   5 ++
 19 files changed, 258 insertions(+), 56 deletions(-)

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