Merge branch 'GOSSIP-21' of github.com:edwardcapriolo/incubator-gossip
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/daea6edb Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/daea6edb Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/daea6edb Branch: refs/heads/master Commit: daea6edb1565548cdc9f1216c6ddde42587c1c5a Parents: 49d9108 3d554f6 Author: Edward Capriolo <[email protected]> Authored: Mon Oct 3 11:41:20 2016 -0400 Committer: Edward Capriolo <[email protected]> Committed: Mon Oct 3 11:41:20 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/gossip/GossipService.java | 14 ++ .../gossip/manager/ActiveGossipThread.java | 99 +++++++---- .../org/apache/gossip/manager/GossipCore.java | 31 +++- .../apache/gossip/manager/GossipManager.java | 19 ++ .../gossip/manager/PassiveGossipThread.java | 13 -- .../OnlyProcessReceivedPassiveGossipThread.java | 80 --------- src/main/java/org/apache/gossip/model/Base.java | 5 +- .../apache/gossip/model/GossipDataMessage.java | 49 ++++++ .../apache/gossip/udp/UdpGossipDataMessage.java | 31 ++++ src/test/java/org/apache/gossip/DataTest.java | 81 +++++++++ .../org/apache/gossip/ShutdownDeadtimeTest.java | 172 ++++++++++--------- .../org/apache/gossip/StartupSettingsTest.java | 3 + .../org/apache/gossip/TenNodeThreeSeedTest.java | 3 +- .../manager/RandomGossipManagerBuilderTest.java | 4 +- 14 files changed, 389 insertions(+), 215 deletions(-) ----------------------------------------------------------------------
