summaryrefslogtreecommitdiff
path: root/spec/unit/puppet/parser/functions/merge_spec.rb
AgeCommit message (Expand)Author
2012-08-20Merge branch '2.1.x' into 2.2.xJeff McCune
2012-08-20(Maint) Fix mis-use of rvalue functions as statementsJeff McCune
2012-08-10Disable tests that fail on 2.6.x due to #15912Patrick Carlisle
2012-08-09Use rvalue functions correctlyPatrick Carlisle
2012-07-23(Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals}Jeff McCune
2012-07-19(Maint) use PuppetlabsSpec::PuppetSeams.parser_scopeJeff McCune
2011-07-29(#8709) Add hash merging functionDan Bode