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/09/12 17:16:58 UTC
[1/3] git commit: Merge branch 'S4-96' into dev
Updated Branches:
refs/heads/dev 53e0d34fb -> a7f86ac47
Merge branch 'S4-96' 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/a7f86ac4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/a7f86ac4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/a7f86ac4
Branch: refs/heads/dev
Commit: a7f86ac47d69e752fe72d3329107ee1d24edd557
Parents: 53e0d34 ad1b1bf
Author: Matthieu Morel <mm...@apache.org>
Authored: Wed Sep 12 18:40:30 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Wed Sep 12 18:40:30 2012 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/core/Key.java | 54 ---------------
.../src/main/java/org/apache/s4/core/Main.java | 9 +++
.../main/java/org/apache/s4/core/RemoteStream.java | 1 +
.../src/main/java/org/apache/s4/core/Stream.java | 1 +
4 files changed, 11 insertions(+), 54 deletions(-)
----------------------------------------------------------------------