+1 on double commit. Jun
On Thu, May 24, 2012 at 11:01 AM, Jay Kreps <jay.kr...@gmail.com> wrote: > Awesome, that is great. Thanks! > > Guys, I wonder if going forward we should perhaps require a double-checkin > for any commit on trunk to 0.8 as well? The reason I would propose this is > that (1) we should be discouraging further development on 0.7 and (2) 0.8 > has so many major changes now that many changes are pretty different. This > effectively makes the merge happen checkin by checkin by the person doing > the change rather than having one person understand everything in the > merge. > > -Jay > > On Thu, May 24, 2012 at 10:12 AM, Joe Stein <crypt...@gmail.com> wrote: > > > looks like 26 conflicts from the last merge to HEAD > > > > working through them now will then compile and see where tests are and > > compare all the changes > > > > have cycles so we'll see where i get to by tonight/tomorrow > > > > On Thu, May 24, 2012 at 12:17 PM, Joe Stein <crypt...@gmail.com> wrote: > > > > > Jun, > > > > > > I will do it now > > > > > > Joestein > > > > > > > > > On Thu, May 24, 2012 at 11:46 AM, Jun Rao <jun...@gmail.com> wrote: > > > > > >> Joe, > > >> > > >> Do you still plan to merge trunk to 0.8? If not, I will do the merge > > after > > >> kafka-46 is committed. > > >> > > >> Thanks, > > >> > > >> Jun > > >> > > >> On Sun, Apr 22, 2012 at 9:26 AM, Joe Stein <crypt...@gmail.com> > wrote: > > >> > > >> > Hey folks, I am finally getting around to starting to get changes > that > > >> have > > >> > gone to trunk since the 0.8 branch and last rebase committed into > the > > >> 0.8 > > >> > branch. I will also have time when done to keep helping with 0.8 > and > > >> other > > >> > things. > > >> > > > >> > So my plan of attack right now (please comment/change if necessary) > > >> > > > >> > 1) take the trunk changes that I am making to the branch, create a > > patch > > >> > and post in the original JIRA ticket with rebase0.8 in the filename > > >> > > > >> > if the changes are not very hairy then > > >> > > > >> > 2) I will just commit that patch to the 0.8 branch since they were > > >> already > > >> > reviewed and committed to trunk > > >> > > > >> > or if they are hairy because of wire or related changes > > >> > > > >> > 2) I will post my thoughts/questions of what the patch should be or > > even > > >> > what the patch might be (as I might not be comfortable introducing > the > > >> > change) and wait in on the original JIRA > > >> > > > >> > I will keep track (thinking maybe even in a JIRA) of the changes > from > > >> where > > >> > I start as I expect more things to keep going to the trunk so we can > > >> have 1 > > >> > rebase branch JIRA for the changes and relate each trunk ticket as I > > >> get to > > >> > it in this rebase JIRA > > >> > > > >> > /* > > >> > Joe Stein > > >> > http://www.linkedin.com/in/charmalloc > > >> > Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop> > > >> > */ > > >> > > > >> > > > > > > > > > > > > -- > > > > > > /* > > > Joe Stein > > > http://www.linkedin.com/in/charmalloc > > > Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop> > > > */ > > > > > > > > > > > -- > > > > /* > > Joe Stein > > http://www.linkedin.com/in/charmalloc > > Twitter: @allthingshadoop <http://www.twitter.com/allthingshadoop> > > */ > > >
