Merge remote-tracking branch 'rbkns/STREAMS-199' into blueprints
Conflicts:
streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/tasks/StreamsProcessorTask.java
streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/tasks/BasicTasksTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/4db27973
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/4db27973
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/4db27973
Branch: refs/heads/blueprints
Commit: 4db27973f238bf213a9bd4c77601759de1f10fc4
Parents: 1cf71a4 015fade
Author: Steve Blackmon <[email protected]>
Authored: Sat Oct 25 15:05:19 2014 -0500
Committer: Steve Blackmon <[email protected]>
Committed: Sat Oct 25 15:05:19 2014 -0500
----------------------------------------------------------------------
.../local/builders/LocalStreamBuilder.java | 5 +++
.../streams/local/tasks/StreamsMergeTask.java | 7 ++++
.../local/tasks/StreamsPersistWriterTask.java | 18 +++++++--
.../local/tasks/StreamsProcessorTask.java | 22 ++++++++---
.../local/tasks/StreamsProviderTask.java | 15 +++++++
.../apache/streams/local/tasks/StreamsTask.java | 4 ++
.../local/builders/LocalStreamBuilderTest.java | 32 ++++++++++++---
.../streams/local/tasks/BasicTasksTest.java | 41 +++++++++++++++-----
8 files changed, 121 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/4db27973/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/builders/LocalStreamBuilderTest.java
----------------------------------------------------------------------
