diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 12:00:28 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 12:00:28 -0700 |
| commit | 1d371ab8b67b85d52f8c4932f78660de8a236b93 (patch) | |
| tree | 4304339b93ca5a0ac044fc43add0b00f3378e0ec /CHANGELOG | |
| parent | e8fb678c91d25c48c99c6347cda33e26e5142a89 (diff) | |
| parent | c8c7afc7a00aaeeddea6514d9fe9508513e53a73 (diff) | |
Merge branch '3.0.x' into 3.1.x
* 3.0.x:
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -1,18 +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 |