On Wed, Apr 20, 2011 at 9:00 AM, Jacob Helwig <[email protected]> wrote:
> There was a topic branch that was accidentally merged into the 2.7.x > branch. Since there wasn't anything else done since this, we're just > rolling 2.7.x back to exclude the merge commit, and the change it > brought in. > > If you're working with the 2.7.x branch, please make sure that it does > not include the commits 8a3071c or c87d6c9. > I've updated the http://projects.puppetlabs.com/projects/puppet/wiki/Engineering_done_done#merged+into+nextto hopefully be a little clearer in where to merge code. Also updated http://projects.puppetlabs.com/projects/puppet/wiki/Iteration_Release_Process#merge+into+mastersince we're ending an iteration today and will need to do this merging. -- 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.
