diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-20 16:16:59 -0500 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-20 16:16:59 -0500 |
commit | 8647691c3a51fb343e5115a5eed38541536a0d30 (patch) | |
tree | 1adcb2d5a11630c49158fcfb62819ab262fbced8 /spec/unit/puppet/parser/functions/strftime_spec.rb | |
parent | eba7d6ac7910fb9e1de2c71179bde798551c160f (diff) | |
parent | ad262b56a432a17bfde66f39b3d6042e2a35eea0 (diff) |
Merge branch '3.x' into 4.x
* 3.x:
Add join_keys_to_values function
Diffstat (limited to 'spec/unit/puppet/parser/functions/strftime_spec.rb')
0 files changed, 0 insertions, 0 deletions