Merge pull request #6 from apache/master Merge Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3b98df84 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3b98df84 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3b98df84 Branch: refs/heads/STREAMS-46 Commit: 3b98df844ca87e79bf9cb88f16fbad361d9959ad Parents: d71b159 ba96627 Author: Robert Douglas <[email protected]> Authored: Tue Jul 1 09:56:26 2014 -0500 Committer: Robert Douglas <[email protected]> Committed: Tue Jul 1 09:56:26 2014 -0500 ---------------------------------------------------------------------- .../ElasticsearchConfigurator.java | 4 + .../ElasticsearchPersistUpdater.java | 35 - .../ElasticsearchPersistWriter.java | 705 +++++++------------ .../ElasticsearchPersistWriterTask.java | 56 -- .../ElasticsearchWriterConfiguration.json | 5 + .../provider/SysomosHeartbeatStream.java | 2 +- .../local/tasks/StreamsProviderTask.java | 51 +- .../local/builders/LocalStreamBuilderTest.java | 52 +- .../local/test/processors/SlowProcessor.java | 50 ++ .../test/providers/EmptyResultSetProvider.java | 2 +- .../test/providers/NumericMessageProvider.java | 63 +- .../test/component/FileReaderProvider.java | 52 +- 12 files changed, 419 insertions(+), 658 deletions(-) ----------------------------------------------------------------------
