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/11/22 17:28:57 UTC

[1/2] git commit: Merge branch 'S4-105' into dev

Updated Branches:
  refs/heads/dev a7f86ac47 -> d9e15996f


Merge branch 'S4-105' 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/d9e15996
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/d9e15996
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/d9e15996

Branch: refs/heads/dev
Commit: d9e15996fde35b2b2dc20211011cb4295ea77586
Parents: a7f86ac 6dd0ed0
Author: Matthieu Morel <mm...@apache.org>
Authored: Thu Nov 22 18:23:40 2012 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Nov 22 18:23:40 2012 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/s4/core/Stream.java   |   23 +++-----------
 .../main/java/org/apache/s4/edsl/AppBuilder.java   |    2 +-
 2 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------