Merge branch 'master' of http://git.apache.org/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/dd2024ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/dd2024ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/dd2024ec Branch: refs/heads/master Commit: dd2024ec65440c39f098f43603e5bc39b6cb3eca Parents: 7413387 0bdf2f6 Author: Edward Capriolo <edlinuxg...@gmail.com> Authored: Tue Jan 3 14:59:21 2017 -0500 Committer: Edward Capriolo <edlinuxg...@gmail.com> Committed: Tue Jan 3 14:59:21 2017 -0500 ---------------------------------------------------------------------- pom.xml | 13 ++++-- .../java/org/apache/gossip/GossipRunner.java | 4 +- .../java/org/apache/gossip/StartupSettings.java | 42 ++++++++++---------- .../gossip/manager/ActiveGossipThread.java | 4 +- .../org/apache/gossip/manager/GossipCore.java | 5 ++- .../gossip/manager/PassiveGossipThread.java | 3 +- .../manager/random/RandomGossipManager.java | 1 - src/main/java/org/apache/gossip/model/Base.java | 8 ++-- .../org/apache/gossip/StartupSettingsTest.java | 3 +- 9 files changed, 45 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/dd2024ec/pom.xml ----------------------------------------------------------------------