diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-15 08:57:21 -0500 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-15 08:57:21 -0500 |
| commit | 5353cd77b79fb43f7e3144f50a531220ad36e262 (patch) | |
| tree | b91a8da738dde7d82e50ebb606de65e206d57517 /spec/unit/puppet/parser/functions/join_spec.rb | |
| parent | b97e053cad947ed712ba3f23400e7f5add56ccd1 (diff) | |
| parent | 43dd60698203482f0b0bd737fb402a4d7c2f4b95 (diff) | |
Merge branch '2.x' into 3.x
* 2.x:
Add the pick() function
Diffstat (limited to 'spec/unit/puppet/parser/functions/join_spec.rb')
0 files changed, 0 insertions, 0 deletions