Merge remote-tracking branch 'rbnks/STREAMS-199'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/660f0c13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/660f0c13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/660f0c13 Branch: refs/heads/STREAMS-49 Commit: 660f0c13639003efd6a0355f25dc25ed66c4b8dc Parents: b8e7a69 79eadea Author: Ryan Ebanks <[email protected]> Authored: Fri Nov 7 13:00:13 2014 -0600 Committer: Ryan Ebanks <[email protected]> Committed: Fri Nov 7 13:00:13 2014 -0600 ---------------------------------------------------------------------- .../local/builders/LocalStreamBuilder.java | 5 +++ .../streams/local/tasks/StreamsMergeTask.java | 7 +++++ .../local/tasks/StreamsPersistWriterTask.java | 18 ++++++++--- .../local/tasks/StreamsProcessorTask.java | 20 +++++++++--- .../local/tasks/StreamsProviderTask.java | 15 +++++++++ .../apache/streams/local/tasks/StreamsTask.java | 4 +++ .../local/builders/LocalStreamBuilderTest.java | 32 +++++++++++++++++--- .../streams/local/tasks/BasicTasksTest.java | 26 +++++++++++++--- 8 files changed, 110 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
