Bill opened a new pull request #5336: URL: https://github.com/apache/geode/pull/5336
Back-port to `support/1.13` branch, of https://github.com/apache/geode/pull/5273 fix for [GEODE-8240](https://issues.apache.org/jira/browse/GEODE-8240) I used `git cherry-pick -x bfe1ca113124ea958dc02dd9be90cdb0aabe5c4d` In resolving conflicts I mostly accepted all non-conflicting changes from 1.13. An exception was that in many places where we were using `version.compareTo(other) < 0` or `version.compareTo(other) >= 0`, I accepted the changes from the cherry-pick commit to replace those with `version.isOlderThan(other)` or `version.isNotOlderThan(other)`. Those changes were all made by @pivotal-jbarrett on `develop` and they improve readability. I did not change `InternalDistributedMember.equals(other)`—instead, I pulled in a couple minor changes to `GMSJoinLeaveJUnitTest` from the `develop` branch, to get that test running with the (wrong/unchanged) `IDM.equals(other)` functionality. Since this ticket is not about fixing `IDM` this was the better way to go. - [x] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message? - [x] Has your PR been rebased against the latest commit within the target branch (typically `develop`)? - [x] Is your initial contribution a single, squashed commit? - [x] Does `gradlew build` run cleanly? - [x] Have you written or updated unit tests to verify your changes? ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
