I went ahead and picked #17521 and #17029 back into the 1.7.x branch so these will be released in 1.7.0.
I've also updated the CONTRIBUTING and COMMITTERS document in Facter. Please see https://github.com/puppetlabs/facter/pull/395 -Jeff On Wed, Feb 13, 2013 at 1:38 PM, Jeff McCune <[email protected]> wrote: > On Wed, Feb 13, 2013 at 12:02 PM, Stefan Schulte < > [email protected]> wrote: > >> On Wed, 6 Feb 2013 14:35:42 -0800 >> Jeff McCune <[email protected]> wrote: >> >> > I'd like to take a quick moment and let everyone know that we're >> > planning on deleting the 2.x branch in the facter repository. The >> > master branch contains all of the same functionality and will become >> > the next major version of Facter, so maintaining both the 2.x and the >> > master branch doesn't make a whole lot of sense. >> >> Can you update the CONTRIBUTING.md to reflect the changes? > > > Definitely, I've added this to the trello card that's tracking the work in > progress: https://trello.com/c/9dtCwRbP > > >> The current >> one states >> >> * `2.x`: new features that are not breaking changes >> * `master`: new features that are breaking changes >> >> Are the changes in 2.x now merged into the 1.7.x branch because they >> are supposed to be non-breaking changes or what does the 1.7.x branch >> now actually contain? >> > > Nearly all of the changes that are in the 2.x branch are also in the 1.7.x > branch. The two exceptions appear to be > #17029<http://projects.puppetlabs.com/issues/17029>and > #17521 <http://projects.puppetlabs.com/issues/17521>, found using this: > > $ git lg 1.7.x..2.x --no-merges > * 1f808cf (#17521) Modify spec to respect Archlinux osfamily 3 months ago > Stefan Schulte > * b1f196a (#17521) Add osfamily fact ArchLinux 3 months ago Niels Abspoel > * 0fcb67b (maint) Avoid "Use RbConfig instead of obsolete and deprecated > Config" message 4 months ago Jeff McCune > * 06d99c0 maint: Improve test coverage for osfamily fact 4 months ago > Stefan Schulte > * 80ba654 maint: Remove trailing whitespace in osfamiliy fact 4 months ago > Stefan Schulte > * c618949 (#17029) add osfamily Gentoo 4 months ago Joshua Hoblitt > * c462b12 (maint) Remove bad test of manufacturer fact on Solaris 4 months > ago Jeff McCune (jeffmccune/maint/2.x/solaris_manufacturer_spec, > maint/2.x/solaris_manufacturer_spec) > * 6e097b9 (maint) Remove rspec from shebang lines 4 months ago Jeff McCune > (maint/2.x/cleanup) > * 6e253d6 (maint) Add newlines to all files (whitespace only) 4 months ago > Jeff McCune > > The 1.7.x branch contains new, backwards compatible functionality and bug > fixes with respect to 1.6.x and is meant to adhere to semantic version > guidelines. > > >> The CONTRIBUTING.md also states that feature branches should be merged >> into 1.6.x, 2.x or master (for security fixes/non-breaking >> changes/breaking changes) and will then automatically be merged up. Is >> this still valid? > > > No, this needs to be updated. The process for Facter should be the same > as Puppet. Feature branches should be merged into master unless there's a > specific reason to merge them into an earlier minor release. We do still > perform merge-ups from 1.6.x => 1.7.x => master, but this merge up process > may change in the future. The merge up is not automatic, so when pushing, > it's important to make sure all affected branches are pushed at the same > time. If I merge a bugfix into 1.6.x, I'll also merge up into 1.7.x and > master and then push all three branches at once using git push puppetlabs > 1.6.x:1.6.x 1.7.x:1.7.x master:master > > Hope this helps, > -Jeff > > -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/puppet-dev?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
