You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/07/21 06:49:23 UTC
[08/18] git commit: Merge branch 'master' into instagram
Merge branch 'master' into instagram
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/815ce2ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/815ce2ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/815ce2ab
Branch: refs/heads/master
Commit: 815ce2abdab1be8e279b48a7e38090f5f6948fcb
Parents: a3f443f c1246d9
Author: mfranklin <mf...@apache.org>
Authored: Wed Jul 2 12:13:35 2014 -0400
Committer: mfranklin <mf...@apache.org>
Committed: Wed Jul 2 12:13:35 2014 -0400
----------------------------------------------------------------------
.../ElasticsearchConfigurator.java | 4 +
.../ElasticsearchPersistUpdater.java | 35 -
.../ElasticsearchPersistWriter.java | 705 +++++++------------
.../ElasticsearchPersistWriterTask.java | 56 --
.../ElasticsearchWriterConfiguration.json | 5 +
.../provider/SysomosHeartbeatStream.java | 2 +-
.../twitter/processor/TwitterTypeConverter.java | 2 +-
.../TwitterJsonActivitySerializer.java | 3 +
.../TwitterJsonUserActivitySerializer.java | 72 ++
.../serializer/util/TwitterActivityUtil.java | 22 +
.../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 +-
16 files changed, 517 insertions(+), 659 deletions(-)
----------------------------------------------------------------------