Merge branch 'STREAMS-230'

Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/efb9437b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/efb9437b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/efb9437b

Branch: refs/heads/STREAMS-212
Commit: efb9437b7806a3a7fdffbb228fb65027e921c458
Parents: 7afd6e0 adc4f2d
Author: sblackmon <[email protected]>
Authored: Mon Dec 1 10:23:18 2014 -0600
Committer: sblackmon <[email protected]>
Committed: Mon Dec 1 10:23:18 2014 -0600

----------------------------------------------------------------------
 .../monitoring/tasks/BroadcastMonitorThread.java     | 15 +++++++++++++++
 .../streams/local/builders/LocalStreamBuilder.java   |  6 +++---
 .../local/builders/LocalStreamBuilderTest.java       |  4 +++-
 3 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/efb9437b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java
----------------------------------------------------------------------

Reply via email to