]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
projects / puppet-stdlib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c8c7afc) | patch
Revert "Merge branch '2.5.x' into 3.0.x"
authorJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:42:05 +0000 (15:42 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 25 Oct 2012 22:42:05 +0000 (15:42 -0700)
commit9e8c60a8b73fd96393b08d690c7197e62aae623e
tree999c0ffc0511fcdf4d6e5ebe8045bd6495a96772tree | snapshot
parentc8c7afc7a00aaeeddea6514d9fe9508513e53a73commit | diff
Revert "Merge branch '2.5.x' into 3.0.x"

This reverts commit c8c7afc7a00aaeeddea6514d9fe9508513e53a73, reversing
changes made to 03ec16e291a70ac5ac412be36ae3b86a771b98af.

This was a mistake on my part.  2.5 is a minor release and minor
releases should never be merged into patch level branches.  2.5.x should
have been merged into 3.1.x instead.
CHANGELOG diff | blob | history
lib/facter/pe_version.rb [deleted file] blob | history
spec/spec_helper.rb diff | blob | history
spec/unit/facter/pe_version_spec.rb [deleted file] blob | history
Puppet module for stdlib