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 2015/10/30 23:21:28 UTC

[2/2] incubator-streams git commit: Merge branch 'STREAMS-378'

Merge branch 'STREAMS-378'

* STREAMS-378:
  resolves STREAMS-378


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/778900d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/778900d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/778900d6

Branch: refs/heads/master
Commit: 778900d6db2cfc74ff59d3f2bf4918e652912192
Parents: 986867d 5e3e18e
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Fri Oct 30 16:56:46 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri Oct 30 16:56:46 2015 -0500

----------------------------------------------------------------------
 .../org/apache/streams/converter/ActivityConverterUtil.java  | 8 +++++++-
 .../apache/streams/rss/provider/RssStreamProviderTask.java   | 6 +++++-
 .../main/java/org/apache/streams/data/util/PropertyUtil.java | 4 +++-
 .../org/apache/streams/dropwizard/StreamsApplication.java    | 7 ++++++-
 .../org/apache/streams/verbs/VerbDefinitionResolver.java     | 6 +++++-
 5 files changed, 26 insertions(+), 5 deletions(-)
----------------------------------------------------------------------