summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-05-23 10:56:05 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-05-23 10:56:05 -0700
commitcf7ac0286043d01aa807743d75574d450536582d (patch)
treea020e667aeb015f6cd39e762347975df4eaae57e /CHANGELOG
parent380f9b66fe9d9b5e246d426095762a331386cf2a (diff)
parent730aee4ef999b73a16d13a6792e10343dbdcabea (diff)
Merge branch '2.3.x'
* 2.3.x: Update CHANGELOG, Modulefile for 2.3.3
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c0b22f6..2ff34d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+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)