Update Modulefile, CHANGELOG for 2.5.0

diff --git a/CHANGELOG b/CHANGELOG
index aa56323af63e9eb0db1b048b86eb467ef3782fa8..579297958935c310811dcfae104937f1336fa274 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,27 @@
+2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0
+ * Add PE facts to stdlib (cdf3b05)
+
+2012-08-15 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+ * Explicitly load functions used by ensure_resource (9fc3063)
+
+2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+ * Add better docs about duplicate resource failures (97d327a)
+
+2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+ * Handle undef for parameter argument (4f8b133)
+
+2012-08-07 - Dan Bode <dan@puppetlabs.com> - 2.5.0
+ * Add function ensure_resource and defined_with_params (a0cb8cd)
+
+2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+ * Disable tests that fail on 2.6.x due to #15912 (c81496e)
+
+2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+ * (Maint) Fix mis-use of rvalue functions as statements (4492913)
+
+2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0
+ * Add .rspec file to repo root (88789e8)
+
 2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0
  * Add support for a 'match' parameter to file_line (a06c0d8)
 

diff --git a/Modulefile b/Modulefile
index 146dbb9a24ad0949c526707d6a7ad22118ca5ce7..8f5bb0a421f5673b394af1884a0d6c2d78bf7168 100644 (file)
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-stdlib'
-version '2.4.0'
+version '2.5.0'
 source 'git://github.com/puppetlabs/puppetlabs-stdlib'
 author 'puppetlabs'
 license 'Apache 2.0'