Re: Release process

2016-09-25 Thread Matt Sicker
t specific bugfixes to the previous release branch to make >>>> minor version releases. We could either fork from the >>>> last 2.6.x release to maintain a 2.6 branch, or we could start with 2.7. >>>> >>>> If there's an easy way to merge s

Re: Release process

2016-09-12 Thread Steffen Offermann
we fix that end of line problem that keeps popping up in certain commits (the ones that rewrite the whole file). That would cause annoying merge conflicts between major release branches. On 12 September 2016 at 17:50, Remko Popma mailto:remko.po...@gmail.com>> wrote: Back to the discussi

Re: Release process

2016-09-12 Thread Ralph Goers
s we fix that end of line >> problem that keeps popping up in certain commits (the ones that rewrite the >> whole file). That would cause annoying merge conflicts between major release >> branches. >> >> On 12 September 2016 at 17:50, Remko Popma > <mailto:remko.po

Re: Release process

2016-09-12 Thread Steffen Offermann
problem that keeps popping up in certain commits (the ones that rewrite the whole file). That would cause annoying merge conflicts between major release branches. On 12 September 2016 at 17:50, Remko Popma mailto:remko.po...@gmail.com>> wrote: Back to the discussion about the release pr

Re: Release process

2016-09-12 Thread Matt Sicker
conflicts between major release branches. On 12 September 2016 at 17:50, Remko Popma wrote: > Back to the discussion about the release process, concretely what are we > going to do differently from what we do now? > > On Sat, Sep 10, 2016 at 3:26 AM, Gary Gregory > wrote: > &g

Re: Release process

2016-09-12 Thread Remko Popma
Back to the discussion about the release process, concretely what are we going to do differently from what we do now? On Sat, Sep 10, 2016 at 3:26 AM, Gary Gregory wrote: > Remko has a branch to merge. > > I'd like to hear from Steffen Offermann > <https://issues.ap

Re: Release process

2016-09-09 Thread Gary Gregory
Remko has a branch to merge. I'd like to hear from Steffen Offermann who has been testing master... Gary On Fri, Sep 9, 2016 at 11:13 AM, Matt Sicker wrote: > Are we all caught up with the desired branches we wanted merged?

Re: Release process

2016-09-09 Thread Matt Sicker
Are we all caught up with the desired branches we wanted merged? On 9 September 2016 at 13:08, Remko Popma wrote: > What is our thinking on this for the upcoming release? > > On Fri, Sep 2, 2016 at 8:22 PM, Mikael Ståldal > wrote: > >> On LOG4J2-1548, Remko Popma >>

Re: Release process

2016-09-09 Thread Remko Popma
What is our thinking on this for the upcoming release? On Fri, Sep 2, 2016 at 8:22 PM, Mikael Ståldal wrote: > On LOG4J2-1548, Remko Popma > > wrote: > > I'm okay with changing the process but we need to think thro

Release process

2016-09-02 Thread Mikael Ståldal
On LOG4J2-1548, Remko Popma wrote: I'm okay with changing the process but we need to think through the > implications of maintaining multiple branches. I don't mind fixing a bug > in, say, the 2.7.x maintenance branc