Merge branch 'STREAMS-39'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/88fcbd8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/88fcbd8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/88fcbd8d Branch: refs/heads/STREAMS-212 Commit: 88fcbd8d2e329c38a2f0ac4e9bc905c8e77cff2d Parents: e679480 40dabfc Author: sblackmon <sblack...@apache.org> Authored: Mon Dec 1 10:27:56 2014 -0600 Committer: sblackmon <sblack...@apache.org> Committed: Mon Dec 1 10:27:56 2014 -0600 ---------------------------------------------------------------------- .../streams/twitter/processor/TwitterEventProcessor.java | 5 ++++- .../streams/twitter/processor/TwitterTypeConverter.java | 5 ++++- .../apache/streams/twitter/provider/TwitterConfigurator.java | 5 ++++- .../streams/twitter/provider/TwitterEventClassifier.java | 2 +- .../streams/twitter/provider/TwitterStreamProvider.java | 3 ++- .../streams/twitter/serializer/StreamsTwitterMapper.java | 4 ++-- .../streams/twitter/serializer/util/TwitterActivityUtil.java | 7 ++++--- .../streams/twitter/test/TwitterEventClassifierTest.java | 2 +- .../streams/twitter/test/TwitterStreamProviderTest.java | 2 +- 9 files changed, 23 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
