diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:44:14 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 15:44:14 -0700 |
| commit | 43729e6ea9371b3335b8bbaf2fe0a5c09a3cd4a5 (patch) | |
| tree | 4304339b93ca5a0ac044fc43add0b00f3378e0ec /CHANGELOG | |
| parent | 2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0 (diff) | |
Revert "Revert "Merge branch '2.5.x' into 3.0.x""
This reverts commit 9e8c60a8b73fd96393b08d690c7197e62aae623e.
This was an error on my part. 3.1.x descends from 3.0.x _and_ 2.5.x, but 3.0.x does
not descend from 2.5.x. I should not have merged 2.5.x into 3.0.x,
instead I should have merged 2.5.x into 3.1.x skipping over the 3.0.x
merge up.
I'm slowly starting to understand the implications of semver on our
branching strategy... =)
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -17,6 +17,30 @@ 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-23 - Matthaus Owens <matthaus@puppetlabs.com> - 2.5.0 + * Add PE facts to stdlib (cdf3b05) + +2012-08-15 - Dan Bode <dan@puppetlabs.com> - 2.5.0 + * Explicitly load functions used by ensure_resource (9fc3063) + +2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0 + * Add better docs about duplicate resource failures (97d327a) + +2012-08-13 - Dan Bode <dan@puppetlabs.com> - 2.5.0 + * Handle undef for parameter argument (4f8b133) + +2012-08-07 - Dan Bode <dan@puppetlabs.com> - 2.5.0 + * Add function ensure_resource and defined_with_params (a0cb8cd) + +2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0 + * Disable tests that fail on 2.6.x due to #15912 (c81496e) + +2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0 + * (Maint) Fix mis-use of rvalue functions as statements (4492913) + +2012-08-20 - Jeff McCune <jeff@puppetlabs.com> - 2.5.0 + * Add .rspec file to repo root (88789e8) + 2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0 * Add support for a 'match' parameter to file_line (a06c0d8) |