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 /spec/functions/ensure_resource_spec.rb | |
| parent | 2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0 (diff) | |
| download | puppet-stdlib-43729e6ea9371b3335b8bbaf2fe0a5c09a3cd4a5.tar.gz puppet-stdlib-43729e6ea9371b3335b8bbaf2fe0a5c09a3cd4a5.tar.bz2 | |
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 'spec/functions/ensure_resource_spec.rb')
0 files changed, 0 insertions, 0 deletions