summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 15:55:04 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 15:55:04 -0700
commit65d9b10876420176715b4a9a5ac3e9cedf881c1d (patch)
tree9d1076d9e3419516769c6a059e154a38b7e91ae2
parent18212dca014d74ecc63c4e1059f7d93d9b0204fe (diff)
parentf4c8c6b8de9c74db6c4a95fc88120de9e4455f55 (diff)
Merge branch '3.x' into 4.x
* 3.x: Update Modulefile, CHANGELOG for 2.5.1
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 728ccbb..8777c2d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,9 @@
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-25 - Jeff McCune <jeff@puppetlabs.com> - 2.5.1
+ * (maint) Fix spec failures resulting from Facter API changes (97f836f)
+
2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0
* Add PE facts to stdlib (cdf3b05)