summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-11-07 09:44:35 -0800
committerJeff McCune <jeff@puppetlabs.com>2012-11-07 09:44:35 -0800
commit0b3e8f59a915fe4536a571234c1eea031b4ad6bb (patch)
tree611f21f881341b3ac8167111869e6f0c57f666a8 /CHANGELOG
parent20f4811a9eb1359cb752d41b7a63cbdb709092e9 (diff)
parentbe71219f128b62ddc61c07d47b0b6dd9ccd6d523 (diff)
Merge branch '3.x' into 4.x
* 3.x: Add function, uriescape, to URI.escape strings. Redmine #17459 Add function, uriescape, to URI.escape strings. Redmine #17459 Update CHANGELOG, Modulefile for 3.1.1
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8777c2d..4578026 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2012-10-25 - Jeff McCune <jeff@puppetlabs.com> - 3.1.1
+ * (maint) Fix spec failures resulting from Facter API changes (97f836f)
+
2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
* Add PE facts to stdlib (cdf3b05)