]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch 'DavidS-broaden-pick-arguments2'
authorAndrew Parker <andy@puppetlabs.com>
Wed, 29 Jan 2014 17:28:48 +0000 (09:28 -0800)
committerAndrew Parker <andy@puppetlabs.com>
Wed, 29 Jan 2014 17:28:48 +0000 (09:28 -0800)
* DavidS-broaden-pick-arguments2:
  (PUP-638) Add a pick_default() function that always returns a value.
  (PUP-636) Ignore generated file


Trivial merge