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/14 12:42:45 UTC
[1/4] git commit: Merge branch 'S4-75' into piper
Updated Branches:
refs/heads/piper 4a30483c2 -> 19b689ed5
Merge branch 'S4-75' 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/19b689ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/19b689ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/19b689ed
Branch: refs/heads/piper
Commit: 19b689ed53273ac825adb70f4874b84553efa4d3
Parents: 4a30483 cbded5a
Author: Matthieu Morel <mm...@apache.org>
Authored: Sat Jul 14 14:31:58 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Sat Jul 14 14:31:58 2012 +0200
----------------------------------------------------------------------
.../java/org/apache/s4/comm/tcp/TCPEmitter.java | 403 ++-------------
.../org/apache/s4/comm/tcp/TCPRemoteEmitter.java | 12 +-
.../org/apache/s4/comm/tcp/NetworkGlitchTest.java | 38 --
.../s4/deploy/prodcon/TestProducerConsumer.java | 4 +-
.../src/main/java/s4app/ConsumerPE.java | 6 +-
.../src/main/java/s4app/ProducerApp.java | 5 +-
.../src/main/java/s4app/ProducerPE.java | 7 +-
7 files changed, 71 insertions(+), 404 deletions(-)
----------------------------------------------------------------------