On Dec 22, 2008, at 2:48 PM, Nigel Kersten wrote:

> This is against 0.24.x btw, from:
>
> http://projects.reductivelabs.com/issues/show/1836
>
> What's the status of 0.24.x patches given that we're not expecting  
> another 0.24.x release? Should we continue to put them in?


Unless it's a critical fix against 0.24.x -- i.e., security or  
critical bug -- it should be against master from now on.

We're going to have a dev call in January to go over all of this (and  
decide some of it), but I think what will happen from now on is that  
all new development and significant bugfix/refactor work goes into  
master, and every release gets its own branch but just for bug- 
fixing.  The big questions are how long-lived those branches are and  
how we decide what makes it into them vs. master.

Fortunately it should *generally* be straightforward to cherry-pick as  
necessary, and it should always be straightforward to merge from the  
release branches into master.

-- 
A child can go only so far in life without potty training. It is not
mere coincidence that six of the last seven presidents were potty
trained, not to mention nearly half of the nation's state legislators.
     -- Dave Barry
---------------------------------------------------------------------
Luke Kanies | http://reductivelabs.com | http://madstop.com


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to