Yes I agree. I've moved trunk to "1.1.0-SNAPSHOT" + created a new branch called "1.0.x-fixes" (which is the current trunk code, minus the recent GSS commits).
Colm. On Mon, Jul 24, 2017 at 11:18 AM, Zheng, Kai <[email protected]> wrote: > Merging it into trunk is fine to me. I suggest the contributor Wei answer > your questions. > > Do we want to do an important release (like 1.1.0) to contain the big > portion of codes? It looks big for the minor 1.0.1 release. I guess we may > need longer time to make it mature. > > Regards, > Kai > > -----Original Message----- > From: Colm O hEigeartaigh [mailto:[email protected]] > Sent: Monday, July 24, 2017 4:56 PM > To: [email protected] > Cc: Zhou, Wei <[email protected]> > Subject: Re: GSSAPI branch > > Apologies, I made a mistake when merging on Friday, actually I ended up > merging the gssapi branch to trunk, not gssapi-rebase as I thought. So the > question is, what is missing for the current gssapi code on trunk before we > can release it? > > Colm. > > On Mon, Jul 24, 2017 at 9:19 AM, Colm O hEigeartaigh <[email protected]> > wrote: > > > Just to clarify, the "gssapi-rebase" branch is the current trunk > > branch with the fixes that were originally ported to "gssapi" applied. > > So the "gssapi" branch can be ignored at this point. Once we are happy > > with the code then we can merge gssapi-rebase to trunk. What is the > "gss-v2" branch? > > > > Colm. > > > > On Fri, Jul 21, 2017 at 10:03 PM, Zheng, Kai <[email protected]> > wrote: > > > >> Thanks Colm for the moving on. > >> > >> I did remember we didn't attempt to merge the work into trunk is > >> because it lacked necessary unit tests but I guess Wei had already > >> implemented some tests? Just checked the codes just merged in, I didn't > find them. > >> > >> @Wei could you help do a check? There're two branches related. It > >> would be great if you could make sure all your gssapi related codes > >> and tests were made in the trunk, so we can safely clean up. > >> gss-v2; > >> gssapi. > >> > >> Thanks Wei for the big contribution and look forward to making it work. > >> > >> Regards, > >> Kai > >> > >> -----Original Message----- > >> From: Colm O hEigeartaigh [mailto:[email protected]] > >> Sent: Friday, July 21, 2017 11:06 PM > >> To: [email protected] > >> Subject: GSSAPI branch > >> > >> I've created a new branch called "gssapi-rebase". I tried to rebase > >> the gssapi branch with the trunk branch but hit a ton of merge > >> conflicts. The gssapi-rebase branch is the current trunk branch with > >> the original GSSAPI patches that were submitted, as well as a few other > fixes. > >> > >> If there are no objections, I'll delete the gssapi branch > >> > >> Colm. > >> > >> > >> -- > >> Colm O hEigeartaigh > >> > >> Talend Community Coder > >> http://coders.talend.com > >> > > > > > > > > -- > > Colm O hEigeartaigh > > > > Talend Community Coder > > http://coders.talend.com > > > > > > -- > Colm O hEigeartaigh > > Talend Community Coder > http://coders.talend.com > -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com
