Merge branch 'master' of http://git.apache.org/incubator-gossip into GOSSIP-21
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/5c660b2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/5c660b2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/5c660b2f Branch: refs/heads/master Commit: 5c660b2fb68b3439bb22a74e172b03eae9c7c420 Parents: f7ee815 bbd4531 Author: Edward Capriolo <[email protected]> Authored: Wed Sep 14 09:54:30 2016 -0400 Committer: Edward Capriolo <[email protected]> Committed: Wed Sep 14 09:54:30 2016 -0400 ---------------------------------------------------------------------- pom.xml | 11 ++++--- .../org/apache/gossip/ShutdownDeadtimeTest.java | 2 +- .../org/apache/gossip/StartupSettingsTest.java | 2 +- .../org/apache/gossip/TenNodeThreeSeedTest.java | 2 +- .../manager/RandomGossipManagerBuilderTest.java | 34 +++++++++++++------- 5 files changed, 32 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
