summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-03-29 15:20:41 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-03-29 15:20:41 -0700
commitd37815e5bfe1d480e5fe4691f82aa615b25a08a2 (patch)
treeaf2b3e2db28fb5a9de84d0b9be908950cc852d81 /CHANGELOG
parent033eddadc2b3f72783056fe7c9d70f651bcdf857 (diff)
parentfea0b06bc828f452900943db962f4f7645bb0802 (diff)
Merge branch '2.3.x'
* 2.3.x: (#13494) Specify the behavior of zero padded strings Update CHANGELOG, Modulefile for 2.1.3
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ac7c65f..f027d4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+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
+
2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1
* (#13091) Fix LoadError bug with puppet apply and puppet_vardir fact