pivotal-jbarrett commented on pull request #7221: URL: https://github.com/apache/geode/pull/7221#issuecomment-1015797494
> Looks like merging of #7217 caused the two conflicts: > > * geode-core/src/main/java/org/apache/geode/management/internal/JmxRmiOpenTypesSerialFilter.java was deleted > * geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java is now using classes that moved from geode-core to geode-serialization (and may have been renamed) Yeah, this PR gets merge conflicts daily since it touches everything. I will rebase later. -- 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: notifications-unsubscr...@geode.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
