Merge remote-tracking branch 'rbnks/shutdown_refinement'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6c32ce21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/6c32ce21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/6c32ce21 Branch: refs/heads/STREAMS-212 Commit: 6c32ce214f10d2870f72da4fa47952768387daed Parents: cb9c6f5 e162ed6 Author: Ryan Ebanks <[email protected]> Authored: Thu Nov 20 18:10:20 2014 -0600 Committer: Ryan Ebanks <[email protected]> Committed: Thu Nov 20 18:10:20 2014 -0600 ---------------------------------------------------------------------- .../java/com/google/gplus/provider/GPlusUserDataProvider.java | 2 +- .../org/apache/streams/local/builders/LocalStreamBuilder.java | 4 ++++ .../java/org/apache/streams/local/tasks/BaseStreamsTask.java | 2 ++ .../apache/streams/local/tasks/StreamsPersistWriterTask.java | 5 +++-- .../org/apache/streams/local/tasks/StreamsProcessorTask.java | 7 +++++-- .../org/apache/streams/local/tasks/StreamsProviderTask.java | 2 ++ 6 files changed, 17 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
