diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-20 16:16:50 -0500 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-20 16:16:50 -0500 |
commit | ad262b56a432a17bfde66f39b3d6042e2a35eea0 (patch) | |
tree | 7b99688f87fa18b9a44aa5f43bdc5831a366ec9e /lib/puppet/parser/functions/rstrip.rb | |
parent | 824ea6d49f7bf58f39b5e54dfbeda6a17d97dcb0 (diff) | |
parent | 6c104e5e3ab8cc01749b52efcfd303d05a0964d4 (diff) |
Merge branch '2.x' into 3.x
* 2.x:
Add join_keys_to_values function
Diffstat (limited to 'lib/puppet/parser/functions/rstrip.rb')
0 files changed, 0 insertions, 0 deletions