summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorPatrick Carlisle <patrick@puppetlabs.com>2012-08-09 14:52:08 -0700
committerPatrick Carlisle <patrick@puppetlabs.com>2012-08-09 14:52:08 -0700
commitcdd45298337df80aad757e81eb7457317219c1b7 (patch)
tree4132ab281a3064b892c4a59ffc99a2a2645a1bbd /CHANGELOG
parentc101da0b83210fe4c1603f3d7a014f72c988f5ac (diff)
parent424b56da616041e365cb471dafc05a3d7ade4e45 (diff)
Merge branch '2.3.x' into 2.4.x
* 2.3.x: Make sure functions are loaded for each test Use rvalue functions correctly (Maint) Don't mock with mocha (Maint) Fix up the get_module_path parser function (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (2.3.x) (Maint) Rename PuppetlabsSpec::Puppet{Seams,Internals} (Maint) use PuppetlabsSpec::PuppetSeams.parser_scope (Maint) Fix interpreter lines Update CHANGELOG, Modulefile for 2.3.3 fix regression in #11017 properly Fix spec tests using the new spec_helper Update CHANGELOG for 2.3.2 release Make file_line default to ensure => present Memoize file_line spec instance variables Fix spec tests using the new spec_helper Revert "Merge remote-tracking branch 'eshamow/tickets/bug/13595_restrict_initialize_everything_for_tests' into 2.2.x" (#13595) initialize_everything_for_tests couples modules Puppet ver
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG16
1 files changed, 16 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f027d4e..2ff34d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+2012-05-22 - Peter Meier <peter.meier@immerda.ch> - 2.3.3
+ * fix regression in #11017 properly (f0a62c7)
+
+2012-05-10 - Jeff McCune <jeff@puppetlabs.com> - 2.3.3
+ * Fix spec tests using the new spec_helper (7d34333)
+
+2012-05-10 - Puppet Labs <support@puppetlabs.com> - 2.3.2
+ * Make file_line default to ensure => present (1373e70)
+ * Memoize file_line spec instance variables (20aacc5)
+ * Fix spec tests using the new spec_helper (1ebfa5d)
+ * (#13595) initialize_everything_for_tests couples modules Puppet ver (3222f35)
+ * (#13439) Fix MRI 1.9 issue with spec_helper (15c5fd1)
+ * (#13439) Fix test failures with Puppet 2.6.x (665610b)
+ * (#13439) refactor spec helper for compatibility with both puppet 2.7 and master (82194ca)
+ * (#13494) Specify the behavior of zero padded strings (61891bb)
+
2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3
* (#11607) Add Rakefile to enable spec testing
* (#12377) Avoid infinite loop when retrying require json