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/19 16:42:17 UTC
[1/2] git commit: Merge branch 'S4-82' into piper
Updated Branches:
refs/heads/piper ecbfd429d -> 6f8ad9294
Merge branch 'S4-82' 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/6f8ad929
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/6f8ad929
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/6f8ad929
Branch: refs/heads/piper
Commit: 6f8ad92947a31570b50a311e14893fab365a5689
Parents: ecbfd42 bf2b1ca
Author: Matthieu Morel <mm...@apache.org>
Authored: Thu Jul 19 18:36:32 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 19 18:36:32 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/core/Sender.java | 35 ++++++++++-----
.../src/main/java/org/apache/s4/core/Stream.java | 2 +-
.../java/org/apache/s4/comm/BareCommModule.java | 5 ++
.../java/org/apache/s4/core/BareCoreModule.java | 1 -
4 files changed, 29 insertions(+), 14 deletions(-)
----------------------------------------------------------------------