diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:29 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-28 14:39:29 -0800 |
| commit | 1e5618c44f1c4ad14c7ba1b3981e950ce7182276 (patch) | |
| tree | e4770f5c660fd3dae47d6ef1324b514d726af263 /CHANGELOG | |
| parent | 16fe71867c997dd24a34aa088def7a1fa4cb5051 (diff) | |
| parent | 2b7591896d790a17f902fbafc2aed8743dc674f2 (diff) | |
Merge branch '2.x' into 3.x
* 2.x:
Update Modulefile, CHANGELOG for 2.6.0
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 27 |
1 files changed, 27 insertions, 0 deletions
@@ -20,6 +20,33 @@ 2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0 * (#13693) moving logic from local spec_helper to puppetlabs_spec_helper (85f96df) +2012-11-28 - Peter Meier <peter.meier@immerda.ch> - 2.6.0 + * Add reject() function (a79b2cd) + +2012-09-18 - Chad Metcalf <chad@wibidata.com> - 2.6.0 + * Add an ensure_packages function. (8a8c09e) + +2012-11-23 - Erik Dalén <dalen@spotify.com> - 2.6.0 + * (#17797) min() and max() functions (9954133) + +2012-05-23 - Peter Meier <peter.meier@immerda.ch> - 2.6.0 + * (#14670) autorequire a file_line resource's path (dfcee63) + +2012-11-19 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 2.6.0 + * Add join_keys_to_values function (ee0f2b3) + +2012-11-17 - Joshua Harlan Lifton <lifton@puppetlabs.com> - 2.6.0 + * Extend delete function for strings and hashes (7322e4d) + +2012-08-03 - Gary Larizza <gary@puppetlabs.com> - 2.6.0 + * Add the pick() function (ba6dd13) + +2012-03-20 - Wil Cooley <wcooley@pdx.edu> - 2.6.0 + * (#13974) Add predicate functions for interface facts (f819417) + +2012-11-06 - Joe Julian <me@joejulian.name> - 2.6.0 + * Add function, uriescape, to URI.escape strings. Redmine #17459 (70f4a0e) + 2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1 * (maint) Fix spec failures resulting from Facter API changes (97f836f) |