4db27973f238bf213a9bd4c77601759de1f10fc4 - streams

commit: 4db27973f238bf213a9bd4c77601759de1f10fc4
[log]
author: Steve Blackmon <sblackmon@w2odigital.com>
Sat Oct 25 15:05:19 2014 -0500
committer: Steve Blackmon <sblackmon@w2odigital.com>
Sat Oct 25 15:05:19 2014 -0500
tree: 75c5c42228115eb4cb2feea5c12b1347857a93c1
parent: 1cf71a4a6f0f69e0b36939c564ec970c2b7a3672 [diff]
parent: 015fadeac499777185f38056f2308272c8404794 [diff]

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

tree: 75c5c42228115eb4cb2feea5c12b1347857a93c1

poms/
provision/
runner/
streams-config/
streams-contrib/
streams-core/
streams-osgi-components/
streams-pojo/
streams-runtimes/
streams-util/
streams-web/
.gitignore
DISCLAIMER
LICENSE
NOTICE
pom.xml
README.txt