Should I create a new JIRA for it, given that it's unlikely to be a straight merge?
On Mon, Jan 18, 2016 at 1:36 PM, Jordan Zimmerman < [email protected]> wrote: > Yeah - I just tried to merge into CURATOR-3.0 and got conflicts. Let me > know if you need help. > > -JZ > > > On Jan 17, 2016, at 7:18 PM, Cameron McKenzie <[email protected]> > wrote: > > > > Yep, just thinking about that now. The transaction APIs are all rewritten > > on the 3.0 branch, so I will need to look at whether this can be merged, > or > > whether it needs to be reimplemented on the 3.0 branch. > > > > On Mon, Jan 18, 2016 at 11:17 AM, Jordan Zimmerman < > > [email protected]> wrote: > > > >> Hi Cam, > >> > >> FYI - don’t forget to merge changes into CURATOR-3.0 > >> > >> -JZ > >
