Update Modulefile, CHANGELOG for 2.6.0

diff --git a/CHANGELOG b/CHANGELOG
index 9acf77023b21a1693a1ba356675754010cb45cfb..b7c3cedbf294fb7e9e92fec96a962d966578a363 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,30 @@
+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)
 

diff --git a/Modulefile b/Modulefile
index 986099ec52ade9a41a0db42b3f8262959a18bb14..c3568e0bce192049aa259f2d7c42e8e771f9a9e7 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-stdlib'
-version '2.5.1'
+version '2.6.0'
 source 'git://github.com/puppetlabs/puppetlabs-stdlib'
 author 'puppetlabs'
 license 'Apache 2.0'