This is an automated email from the ASF dual-hosted git repository.

jjramos pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.


    from d09b26a  Merge pull request #4966 from demery-pivotal/geode-7851/logout
     add e1c17e1  Revert "GEODE-7565: Allow gateway receivers with same host 
and port (#4824)" (#4974)

No new revisions were added by this update.

Summary of changes:
 .../LocatorLoadSnapshotIntegrationTest.java        |   7 +-
 .../codeAnalysis/sanctionedDataSerializables.txt   |   4 -
 .../client/internal/CacheServerLoadMessage.java    |   4 +-
 .../cache/client/internal/LiveServerPinger.java    |   2 +-
 .../apache/geode/cache/client/internal/PingOp.java |  21 +--
 .../geode/cache/client/internal/ServerProxy.java   |  10 ++
 .../distributed/internal/LocatorLoadSnapshot.java  | 177 +++++----------------
 .../internal/ServerLocationAndMemberId.java        |  72 ---------
 .../geode/distributed/internal/ServerLocator.java  |  14 +-
 .../org/apache/geode/internal/DSFIDFactory.java    |   2 -
 .../internal/cache/DistributedPingMessage.java     |  79 ---------
 .../apache/geode/internal/cache/GridAdvisor.java   |  10 +-
 .../internal/cache/tier/sockets/command/Ping.java  |  48 +-----
 .../internal/LocatorLoadSnapshotJUnitTest.java     |  72 ++++-----
 .../sockets/ClientServerMiscDUnitTestBase.java     |  19 ---
 .../serialization/DataSerializableFixedID.java     |   2 -
 16 files changed, 102 insertions(+), 441 deletions(-)
 delete mode 100644 
geode-core/src/main/java/org/apache/geode/distributed/internal/ServerLocationAndMemberId.java
 delete mode 100644 
geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPingMessage.java

Reply via email to