diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-26 16:34:04 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-26 16:34:04 -0800 |
| commit | 276abac257e750debe8502e67070f57bc8c79c3a (patch) | |
| tree | b2f9d204dd2c47ed389a7649c3721e06de98304a /spec/unit/puppet/parser/functions/merge_spec.rb | |
| parent | 0648148bfb70159dcf2eb2af3d8e67842ce96f85 (diff) | |
| parent | 6f76d8dfd179d3beb73bf69d1ce31411ba3f12ed (diff) | |
Merge branch '2.x' into 3.x
* 2.x:
(#17797) min() and max() functions
Diffstat (limited to 'spec/unit/puppet/parser/functions/merge_spec.rb')
0 files changed, 0 insertions, 0 deletions