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-46 Commit: 5c9a531d9227f44133fe67aea3f90ebbaf3de020 Parents: af1f294 38ed41a Author: Robert Douglas <[email protected]> Authored: Thu Jul 10 10:15:52 2014 -0500 Committer: Robert Douglas <[email protected]> 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(-) ----------------------------------------------------------------------
