summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 11:59:02 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 11:59:02 -0700
commitc8c7afc7a00aaeeddea6514d9fe9508513e53a73 (patch)
tree6cfe459dced10ecd8f88bcf079e5ffee717083e6 /CHANGELOG
parent03ec16e291a70ac5ac412be36ae3b86a771b98af (diff)
parent88af331b0e9b0e8c8a3c1e74e4c5598dc7b8e1c8 (diff)
downloadpuppet-stdlib-c8c7afc7a00aaeeddea6514d9fe9508513e53a73.tar.gz
puppet-stdlib-c8c7afc7a00aaeeddea6514d9fe9508513e53a73.tar.bz2
Merge branch '2.5.x' into 3.0.x
* 2.5.x: Update Modulefile, CHANGELOG for 2.5.0 Explicitly load functions used by ensure_resource re-formatting Add better docs about duplicate resource failures Handle undef for parameter argument Add function ensure_resource and defined_with_params Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"" Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x" Prevent undefined method `split' for nil:NilClass with pe_foo_version facts (maint) Clear all facts before each example Add spec tests for pe_version facts Add PE facts to stdlib Conflicts: CHANGELOG Modulefile spec/spec_helper.rb
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG24
1 files changed, 24 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f1bb667..82f8a6e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,30 @@
2012-04-10 - Chris Price <chris@puppetlabs.com> - 3.0.0
* (#13693) moving logic from local spec_helper to puppetlabs_spec_helper (85f96df)
+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)