From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 19:00:28 +0000 (-0700)
Subject: Merge branch '3.0.x' into 3.1.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1d371ab8b67b85d52f8c4932f78660de8a236b93;p=puppet-stdlib.git

Merge branch '3.0.x' into 3.1.x

* 3.0.x:

Conflicts:
	CHANGELOG
	Modulefile
---

1d371ab8b67b85d52f8c4932f78660de8a236b93
diff --cc CHANGELOG
index d5c18f8,82f8a6e..728ccbb
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,18 -1,3 +1,6 @@@
- 2012-08-07 - Dan Bode <dan@puppetlabs.com> - 3.1.0
-  * Add function ensure_resource and defined_with_params (a0cb8cd)
- 
 +2012-10-23 - Matthaus Owens <matthaus@puppetlabs.com> - 3.1.0
 + * Add PE facts to stdlib (cdf3b05)
 +
- 2012-08-30 - Paul Tötterman <paul.totterman@iki.fi> - 3.1.0
-  * Fix some logical inconsistencies in README (4169e77)
- 
- 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 3.1.0
-  * Disable tests that fail on 2.6.x due to #15912 (c81496e)
- 
- 2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 3.1.0
-  * (Maint) Fix mis-use of rvalue functions as statements (4492913)
- 
  2012-08-16 - Jeff McCune <jeff@puppetlabs.com> - 3.0.1
   * Fix accidental removal of facts_dot_d.rb in 3.0.0 release