From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 22:54:51 +0000 (-0700)
Subject: Merge branch '2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f4c8c6b8de9c74db6c4a95fc88120de9e4455f55;p=puppet-stdlib.git

Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.5.1

Conflicts:
	CHANGELOG
	Modulefile
---

f4c8c6b8de9c74db6c4a95fc88120de9e4455f55
diff --cc CHANGELOG
index 728ccbb,9acf770..8777c2d
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,22 -1,6 +1,25 @@@
 +2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
 + * Add PE facts to stdlib (cdf3b05)
 +
 +2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.1
 + * Fix accidental removal of facts_dot_d.rb in 3.0.0 release
 +
 +2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.0
 + * stdlib 3.0 drops support with Puppet 2.6
 + * stdlib 3.0 preserves support with Puppet 2.7
 +
 +2012-08-07 - Dan Bode <dan@puppetlabs.com> - 3.0.0
 + * Add function ensure_resource and defined_with_params (ba789de)
 +
 +2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 3.0.0
 + * (#2157) Remove facter_dot_d for compatibility with external facts (f92574f)
 +
 +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)