gossip-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecapri...@apache.org
Subject [11/12] incubator-gossip git commit: Rebase
Date Sat, 11 Jun 2016 00:16:48 GMT
Rebase


Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/496f299d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/496f299d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/496f299d

Branch: refs/heads/master
Commit: 496f299d018a9b9bb2902d60156316e4c8e47142
Parents: 900bfda 5532585
Author: Edward Capriolo <edlinuxguru@gmail.com>
Authored: Tue Jun 7 22:55:48 2016 -0400
Committer: Edward Capriolo <edlinuxguru@gmail.com>
Committed: Tue Jun 7 22:55:48 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/gossip/GossipService.java   |  5 --
 .../manager/random/RandomGossipManager.java     | 78 --------------------
 2 files changed, 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-gossip/blob/496f299d/src/main/java/org/apache/gossip/GossipService.java
----------------------------------------------------------------------
diff --cc src/main/java/org/apache/gossip/GossipService.java
index d07c070,3175706..866dc03
--- a/src/main/java/org/apache/gossip/GossipService.java
+++ b/src/main/java/org/apache/gossip/GossipService.java
@@@ -60,20 -60,8 +60,15 @@@ public class GossipService 
    public GossipService(String cluster, URI uri, String id,
            List<GossipMember> gossipMembers, GossipSettings settings, GossipListener
listener)
            throws InterruptedException, UnknownHostException {
- <<<<<<< HEAD
--    gossipManager = new RandomGossipManager(cluster, uri, id, settings, gossipMembers,
--            listener);
- =======
 +    gossipManager = RandomGossipManager.newBuilder()
 +        .withId(id)
 +        .cluster(cluster)
 +        .address(ipAddress)
 +        .port(port)
 +        .settings(settings)
 +        .gossipMembers(gossipMembers)
 +        .listener(listener)
 +        .build();
- >>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager
(Jaideep Dhok via EGC)
    }
  
    public void start() {


Mime
View raw message