]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
projects / puppet-stdlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2ce2c5b) | patch
Revert "Revert "Merge branch '2.5.x' into 3.0.x""
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:44:14 +0000 (15:44 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:44:14 +0000 (15:44 -0700)
commit43729e6ea9371b3335b8bbaf2fe0a5c09a3cd4a5
tree4304339b93ca5a0ac044fc43add0b00f3378e0ectree | snapshot
parent2ce2c5bd8d138fcaf6485a6bd35c1da0f567b4d0commit | 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...  =)
CHANGELOG diff | blob | history
lib/facter/pe_version.rb [new file with mode: 0644] blob
spec/spec_helper.rb diff | blob | history
spec/unit/facter/pe_version_spec.rb [new file with mode: 0644] blob
Puppet module for stdlib