Merge branch 'STREAMS-57' into blueprints
Conflicts:
streams-pojo/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2d61837d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2d61837d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2d61837d
Branch: refs/heads/blueprints
Commit: 2d61837df1e43c079d4fc661f8ff77c3c8cfb91c
Parents: 4b59608 efa59fb
Author: sblackmon <[email protected]>
Authored: Sat Oct 25 12:52:14 2014 -0500
Committer: sblackmon <[email protected]>
Committed: Sat Oct 25 12:52:14 2014 -0500
----------------------------------------------------------------------
.../twitter/processor/TwitterTypeConverter.java | 1 +
.../provider/TwitterEventClassifier.java | 2 +-
.../TwitterJsonActivitySerializer.java | 4 ++
...erJsonUserstreameventActivitySerializer.java | 40 +++++++++++++++++---
.../test/TwitterEventClassifierTest.java | 14 +++++++
streams-pojo/pom.xml | 2 +
.../streams/pojo/json/verbs/stop-following.json | 16 ++++++++
.../apache/streams/pojo/json/verbs/unlike.json | 16 ++++++++
8 files changed, 88 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
