Merge branch 'STREAMS-242'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/8517eed8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/8517eed8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/8517eed8 Branch: refs/heads/master Commit: 8517eed85ccb20dbb507a5065db21e0e2107f8a5 Parents: bf69632 3f20787 Author: Steve Blackmon <[email protected]> Authored: Sat Dec 6 12:35:00 2014 -0600 Committer: Steve Blackmon <[email protected]> Committed: Sat Dec 6 12:35:00 2014 -0600 ---------------------------------------------------------------------- pom.xml | 12 ++++- .../streams-provider-datasift/pom.xml | 50 ++++++++------------ .../DatasiftActivitySerializerTest.java | 7 ++- .../serializer/DatasiftEventClassifierTest.java | 11 ++++- ...DatasiftInstagramActivitySerializerTest.java | 6 ++- ...tasiftInteractionActivitySerializerTest.java | 6 ++- .../DatasiftTwitterActivitySerializerTest.java | 8 +++- streams-util/pom.xml | 15 ++++++ .../streams/util/files/StreamsScannerUtil.java | 21 ++++++++ 9 files changed, 98 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/8517eed8/pom.xml ----------------------------------------------------------------------
