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/03/20 02:02:30 UTC
[2/2] git commit: Merge branch 'STREAMS-26' of
https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-26
Merge branch 'STREAMS-26' of https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-26
Conflicts:
provision/provision.iml
streams-contrib/streams-components-test/streams-components-test.iml
streams-contrib/streams-provider-rss/streams-provider-rss.iml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/81478217
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/81478217
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/81478217
Branch: refs/heads/STREAMS-26
Commit: 81478217f66cb326bd377977fdddd7129c9ca196
Parents: d4b03f8 3a19288
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Wed Mar 19 19:22:59 2014 -0500
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Wed Mar 19 19:22:59 2014 -0500
----------------------------------------------------------------------
provision/provision.iml | 19 ++++++
streams-contrib/pom.xml | 11 ++--
.../streams-components-test.iml | 55 +++++++++++++++++
.../streams/hdfs/WebHdfsPersistReader.java | 27 ++++++---
.../streams/hdfs/WebHdfsPersistReaderTask.java | 4 +-
.../streams/rss/provider/RssStreamProvider.java | 2 +-
.../streams/rss/test/Top100FeedsTest.java | 4 +-
.../streams-provider-rss.iml | 63 ++++++++++++++++++++
.../apache/streams/sysomos/SysomosProvider.java | 20 +++----
.../core/builders/LocalStreamBuilder.java | 2 +-
.../core/builders/LocalStreamBuilderTest.java | 10 ++--
11 files changed, 182 insertions(+), 35 deletions(-)
----------------------------------------------------------------------