summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/deep_merge.rb
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2015-09-21 16:33:22 -0700
committerBryan Jen <bryan.jen@gmail.com>2015-09-21 16:33:22 -0700
commitcebb9f333f4eb80f9782363ebb50cdabcb95b625 (patch)
tree50a63ccfca7fb4615fa9c75bbd139534baccca33 /lib/puppet/parser/functions/deep_merge.rb
parent97bd656efbd4ef70bb321f728e0f611fa931ad02 (diff)
parentb20239e7963a370d4a4eefb5754ddc6a2c072ab9 (diff)
Merge pull request #528 from mhaskel/is_a_fixes
Update is_a acceptance tests to only run on puppet4
Diffstat (limited to 'lib/puppet/parser/functions/deep_merge.rb')
0 files changed, 0 insertions, 0 deletions