DomGarguilo commented on PR #4894: URL: https://github.com/apache/accumulo/pull/4894#issuecomment-2597165843
Oops, yep I will make sure to do that first thing tomorrow. I didn’t merge right away since there was another merge in progress and then forgot to follow up. On Thu, Jan 16, 2025 at 7:12 PM Christopher Tubbs ***@***.***> wrote: > @DomGarguilo <https://github.com/DomGarguilo> It looks like this wasn't > merged fully into the main branch yesterday, and there are some outstanding > conflicts with the Monitor. @keith-turner > <https://github.com/keith-turner> merged it up to 3.1 today, resolving > the conflicts in 3.1. If you are able, it would be great if you could merge > 3.1 into main and resolve the conflicts from this PR on the Monitor (and > also double check the merge from 2.1 into 3.1 to make sure that that merge > went okay). > > — > Reply to this email directly, view it on GitHub > <https://github.com/apache/accumulo/pull/4894#issuecomment-2597163236>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ALMD2IM4NT5DZ5VTOH24NLT2LBDGHAVCNFSM6AAAAABOMFWZICVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKOJXGE3DGMRTGY> > . > You are receiving this because you were mentioned.Message ID: > ***@***.***> > -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
