Merge branch 'STREAMS-393'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c7490d3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c7490d3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c7490d3b Branch: refs/heads/STREAMS-389 Commit: c7490d3b621429df235b6280f7b86837623ab80c Parents: 19f69e5 296861a Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Wed Mar 2 11:52:47 2016 -0600 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Wed Mar 2 11:52:47 2016 -0600 ---------------------------------------------------------------------- .../processor/PercolateTagProcessor.java | 5 ++-- .../filebuffer/FileBufferPersistReader.java | 2 +- .../org/apache/streams/tika/TikaProcessor.java | 3 +-- .../streams/urls/LinkHelperFunctionsTest.java | 26 +++++++++++--------- .../com/datasift/test/DatasiftSerDeTest.java | 1 - .../facebook/test/FacebookActivitySerDeIT.java | 3 +-- .../facebook/test/FacebookPageSerDeIT.java | 3 +-- .../facebook/test/FacebookPostSerDeIT.java | 3 +-- .../test/FacebookEDCAsActivityTest.java | 2 +- .../facebook/test/FacebookEDCSerDeTest.java | 2 +- .../flickr/test/FlickrEDCAsActivityTest.java | 2 +- .../gnip/flickr/test/FlickrEDCSerDeTest.java | 2 +- .../com/gplus/api/GPlusEDCAsActivityTest.java | 5 ++-- .../reddit/api/RedditEDCAsActivityJSONTest.java | 5 ++-- .../java/com/gnip/test/YouTubeEDCSerDeTest.java | 2 +- .../com/gnip/test/YoutubeEDCAsActivityTest.java | 2 +- .../twitter/test/InstagramActivitySerDeIT.java | 7 ++---- .../data/MoreoverJsonActivitySerializer.java | 6 ++++- .../streams/data/util/MoreoverTestUtil.java | 7 ++++-- .../rss/test/SyndEntryActivitySerializerIT.java | 13 +++++----- .../converter/util/TwitterActivityUtil.java | 6 ++++- .../twitter/test/TwitterObjectMapperIT.java | 3 +-- .../test/processors/DoNothingProcessor.java | 6 ++++- .../PassthroughDatumCounterProcessor.java | 8 ++++-- .../local/test/writer/DoNothingWriter.java | 6 ++++- .../local/test/writer/SystemOutWriter.java | 6 ++++- 26 files changed, 78 insertions(+), 58 deletions(-) ----------------------------------------------------------------------