Re: Missing commits on the master branch

2021-09-13 Thread Gary Gregory
I must have gotten side tracked and not ported to master. Sorry about that. Please go ahead, on planes today... Gary On Mon, Sep 13, 2021, 13:59 Carter Kozak wrote: > In cherry-picking a change from release-2.x to master I ran into some > conflicts because > https://github.com/apache/logging-lo

Missing commits on the master branch

2021-09-13 Thread Carter Kozak
In cherry-picking a change from release-2.x to master I ran into some conflicts because https://github.com/apache/logging-log4j2/commit/97ec707d69280ef57aed8fd5831dc4f3a75f7715 was merged to the release branch, but never ported to master. Gary, do you recall if this was intentional? If not I'd