On Thu, 22 Jul 2010 17:36:32 -0700 Jesse A Wolfe <[email protected]> wrote:
> That's ... even stranger. I'm sure that I've only merged changes into > "next" from the "0.25.x" and "master" branches. > > And it looks to me that my patch successfully made it into the 2.6.0 > release. What version are you patching against, Marc? I hit bug #2668 on a node with 0.25.5 from the EPEL repository. I considered the issue only partly related so I created #4313 instead of reopening #2668. My patch was done on top of http://github.com/reductivelabs/puppet/tree/0.25.x >From what I understand scrolling through gitk, dc1a977 got applied to the "next" branch, which of course didn't get merged into "0.25.x". Maybe would it be better to apply dc1a977 to the "0.25.x" branch using git-cherry-pick and drop my patch ? > As of today, "2.6.x" exists as a fork of "master" > "next" will become a staging zone for commits that will eventually > their way into "master" which will eventually become the next major > release ("statler" or "2.7.0" or "27.0") Nice, that makes things more consistent with pre-2.6 times :-) Cheers, Marc -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
