summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-11-10 17:15:11 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-11-10 17:15:11 -0800
commit0a8963fbd384a477ee69917b4dd4c0bb405bc153 (patch)
tree0fbc4c4d58cfb2906a999f92a98ee51150c88dae /lib/puppet/parser/functions/merge.rb
parentd8b86fdcc2711bff15a169552641e6fec0546ccd (diff)
parent4949cfd21cb97b17006d82f2f192ec9d01b0d1ee (diff)
downloadpuppet-stdlib-0a8963fbd384a477ee69917b4dd4c0bb405bc153.tar.gz
puppet-stdlib-0a8963fbd384a477ee69917b4dd4c0bb405bc153.tar.bz2
Merge pull request #357 from hunner/hasInterfaceWithLookupBug
(PUP-3597) Catch :undefined_variable when Future Parser is enabled on 3.7.x
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
0 files changed, 0 insertions, 0 deletions