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 2012/07/13 14:36:58 UTC
[1/4] git commit: Merge branch 'S4-74' into piper
Updated Branches:
refs/heads/piper 5f84f1f21 -> 4a30483c2
Merge branch 'S4-74' into piper
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/4a30483c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/4a30483c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/4a30483c
Branch: refs/heads/piper
Commit: 4a30483c289f6f92f95f006485634b94b484a524
Parents: 5f84f1f a4449c1
Author: Matthieu Morel <mm...@apache.org>
Authored: Fri Jul 13 16:30:36 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Fri Jul 13 16:30:36 2012 +0200
----------------------------------------------------------------------
.../java/org/apache/s4/comm/tcp/TCPEmitter.java | 39 ++++--
.../s4/comm/topology/ClusterChangeListener.java | 2 +-
.../java/org/apache/s4/comm/udp/UDPEmitter.java | 12 ++-
.../java/org/apache/s4/comm/udp/UDPListener.java | 4 +
.../src/main/java/org/apache/s4/core/App.java | 108 +++++++--------
.../src/main/java/org/apache/s4/core/Stream.java | 18 ++-
.../s4/deploy/prodcon/TestProducerConsumer.java | 39 +++++-
.../java/org/apache/s4/example/counter/MyApp.java | 2 +-
.../org/apache/s4/example/model/Controller.java | 2 +-
9 files changed, 136 insertions(+), 90 deletions(-)
----------------------------------------------------------------------