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/16 04:02:04 UTC

[12/18] git commit: Merge pull request #8 from apache/master

Merge pull request #8 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/5c9a531d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/5c9a531d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/5c9a531d

Branch: refs/heads/STREAMS-134
Commit: 5c9a531d9227f44133fe67aea3f90ebbaf3de020
Parents: af1f294 38ed41a
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Thu Jul 10 10:15:52 2014 -0500
Committer: Robert Douglas <rd...@w2odigital.com>
Committed: Thu Jul 10 10:15:52 2014 -0500

----------------------------------------------------------------------
 .../ElasticsearchPersistReader.java             |  3 +-
 .../DatasiftTypeConverterProcessor.java         | 12 +-----
 .../DatasiftTweetActivitySerializer.java        | 42 +++++++++++++++++++-
 .../provider/SysomosHeartbeatStream.java        | 10 +++++
 .../sysomos/provider/SysomosProvider.java       |  4 +-
 5 files changed, 57 insertions(+), 14 deletions(-)
----------------------------------------------------------------------