summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions/merge.rb
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-04-16 16:00:32 -0400
committerAshley Penney <ashley.penney@puppetlabs.com>2014-04-16 16:00:32 -0400
commit6a5dee25a6005280ef86a523192acf9b4d02e7ce (patch)
tree83c292718aa2c91657a99c958ec2112fa57bd796 /lib/puppet/parser/functions/merge.rb
parent746a4cc67a57c23bbadbb8c3a11c648b3a9e7596 (diff)
parentb691be7ea965af9fab501b31817be57f04b89243 (diff)
downloadpuppet-stdlib-6a5dee25a6005280ef86a523192acf9b4d02e7ce.tar.gz
puppet-stdlib-6a5dee25a6005280ef86a523192acf9b4d02e7ce.tar.bz2
Merge pull request #239 from kylog/maint/remove-facter-versions-test
(maint) Remove facter versions test
Diffstat (limited to 'lib/puppet/parser/functions/merge.rb')
0 files changed, 0 insertions, 0 deletions