Skip to content

Commit 73261f1

Browse files
author
Jeff McCune
committed
Merge branch '2.1.x' into 2.2.x
* 2.1.x: Disable tests that fail on 2.6.x due to #15912 Conflicts: spec/unit/puppet/parser/functions/getvar_spec.rb spec/unit/puppet/parser/functions/has_key_spec.rb spec/unit/puppet/parser/functions/merge_spec.rb
2 parents a8a4f93 + 8fdd595 commit 73261f1

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)