We owe Jan a review of his work on https://issues.apache.org/jira/browse/COUCHDB-1585 before we can pick it onto the 1.3.x branch.
The other missing commit is 5d4ef93048f4aca24bef00fb5b2c13c54c2bbbb3 which is a refinement of the fix for COUCHDB-1607. I think it's fine to cherry pick but would like a quick review anyway. On 27 November 2012 09:44, Robert Newson <[email protected]> wrote: > For now, I'm just cherry picking the things that are missing. > > > On 27 November 2012 09:40, Benoit Chesneau <[email protected]> wrote: > >> On Tue, Nov 27, 2012 at 10:13 AM, Robert Newson <[email protected]> >> wrote: >> > There are changes that should be in master only, merging must not >> happen. >> > >> > There are some missing items on master, though, like the CHANGES change >> to >> > describe the server UUID. I'll take care of it. >> > >> > >> >> Bad linking sorry. Also by merge i meant rebase or whatever :) >> >> - benoit >> > >
