You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2013/01/25 15:21:18 UTC
[3/3] git commit: Merge branch 'S4-114' into dev
Updated Branches:
refs/heads/dev 051082eb7 -> 6cd87427e
Merge branch 'S4-114' into dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/6cd87427
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/6cd87427
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/6cd87427
Branch: refs/heads/dev
Commit: 6cd87427eccc23f1bb5c9879629d35d1f5d86416
Parents: 051082e d6decd0
Author: Matthieu Morel <mm...@apache.org>
Authored: Fri Jan 25 15:40:18 2013 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Fri Jan 25 15:40:18 2013 +0100
----------------------------------------------------------------------
.../java/org/apache/s4/comm/DefaultCommModule.java | 11 +-
.../apache/s4/comm/tcp/DefaultRemoteEmitters.java | 59 ++++
.../org/apache/s4/comm/tcp/RemoteEmitters.java | 47 +---
.../apache/s4/comm/topology/AssignmentFromZK.java | 14 +-
.../org/apache/s4/comm/topology/ClusterFromZK.java | 13 +-
.../apache/s4/comm/topology/ClustersFromZK.java | 15 +-
.../org/apache/s4/comm/topology/RemoteStreams.java | 219 +-------------
.../apache/s4/comm/topology/ZkRemoteStreams.java | 238 +++++++++++++++
.../s4/comm/topology/AssignmentsFromZKTest1.java | 4 +-
.../s4/comm/topology/ClustersFromZKTest.java | 10 +-
.../org/apache/s4/fixtures/TestCommModule.java | 7 +-
.../main/java/org/apache/s4/core/BaseModule.java | 5 +
.../java/org/apache/s4/core/DefaultCoreModule.java | 8 +-
.../org/apache/s4/core/DefaultRemoteSenders.java | 124 ++++++++
.../java/org/apache/s4/core/RemoteSenders.java | 113 +-------
.../java/org/apache/s4/core/ZkClientProvider.java | 37 +++
.../s4/fixtures/AssignmentFromZKNoFailFast.java | 7 +-
.../s4/fixtures/ClusterFromZKNoFailFast.java | 7 +-
.../s4/fixtures/ClustersFromZKNoFailFast.java | 7 +-
.../org/apache/s4/fixtures/MockCommModule.java | 4 -
.../org/apache/s4/fixtures/MockCoreModule.java | 6 +
21 files changed, 531 insertions(+), 424 deletions(-)
----------------------------------------------------------------------