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/06/01 11:33:04 UTC
[14/50] [abbrv] git commit: Merge branch 'S4-120' into dev
Merge branch 'S4-120' into dev
Conflicts:
subprojects/s4-core/src/main/java/org/apache/s4/core/DefaultCoreModule.java
subprojects/s4-core/src/main/java/org/apache/s4/core/S4Bootstrap.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/eb20b959
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/eb20b959
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/eb20b959
Branch: refs/heads/master
Commit: eb20b959c1a61682f4374f7ae0261cfa858b4ccd
Parents: 23ba466 1eb5c87
Author: Daniel Gómez Ferro <df...@apache.org>
Authored: Thu Mar 7 15:56:54 2013 +0100
Committer: Daniel Gómez Ferro <df...@apache.org>
Committed: Thu Mar 7 15:56:54 2013 +0100
----------------------------------------------------------------------
.../java/org/apache/s4/comm/DefaultCommModule.java | 11 +++++------
.../java/org/apache/s4/comm/tcp/TCPEmitter.java | 3 ++-
.../java/org/apache/s4/comm/tcp/TCPListener.java | 2 ++
.../org/apache/s4/comm/topology/ClusterFromZK.java | 2 ++
.../apache/s4/comm/topology/ClustersFromZK.java | 3 ++-
.../java/org/apache/s4/comm/udp/UDPEmitter.java | 2 ++
.../java/org/apache/s4/comm/udp/UDPListener.java | 14 +++++++++-----
.../main/java/org/apache/s4/core/BaseModule.java | 5 ++---
.../java/org/apache/s4/core/DefaultCoreModule.java | 5 ++---
.../org/apache/s4/core/DefaultRemoteSenders.java | 2 ++
.../java/org/apache/s4/core/ZkClientProvider.java | 9 ++++++---
.../s4/core/ft/NoOpCheckpointingFramework.java | 5 ++++-
12 files changed, 40 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/eb20b959/subprojects/s4-comm/src/main/java/org/apache/s4/comm/DefaultCommModule.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/eb20b959/subprojects/s4-core/src/main/java/org/apache/s4/core/DefaultCoreModule.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/eb20b959/subprojects/s4-core/src/main/java/org/apache/s4/core/DefaultRemoteSenders.java
----------------------------------------------------------------------