RE: Merging 0.20 BRANCH and TRUNK WAS -> Re: JIRAs committed on trunk but not branch (take 2)

[Andrew Purtell <ap...@apache.org>]

I basically share Jon's position on branch vs. trunk and 2248. 

> From: Jonathan Gray
[...]
> I agree that after going over the diffs between branch and
> trunk, the better choice is to switch to trunk and merge in
> the stuff that went into branch that didn't make it into
> trunk.  I went through the list of what's in trunk and
> not branch twice last night and there's really nothing
> significant outside of replication, test refactoring, shell
> stuff, and some HLog fixes/refactors.  Lots of
> stability/testing work still needs to be done around HLog
> and recovery but we should do it against trunk where some
> good stuff has already gone in.
[...]
> Some of the other smaller jiras that were done against
> branch only could trickle in after the move, if necessary,
> but 2248 at least appears to be a blocker to doing this
> transition.
> 
> Ryan, are you comfortable with this?
> 
> If Ryan can do the port of 2248 to trunk this week, then
> I'm +1 on merging branch into trunk.  I would then
> think that in a 2-3 week timeframe we would cut a new branch
> off of trunk and stabilize it.
[...]