Merge branch 'instagram' into STREAMS-122
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/23bfcac8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/23bfcac8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/23bfcac8 Branch: refs/heads/STREAMS-46 Commit: 23bfcac82884d3280815f1168b82e263f38ef1fb Parents: fa3f922 815ce2a Author: Robert Douglas <[email protected]> Authored: Wed Jul 2 11:17:27 2014 -0500 Committer: Robert Douglas <[email protected]> Committed: Wed Jul 2 11:17:27 2014 -0500 ---------------------------------------------------------------------- .../twitter/processor/TwitterTypeConverter.java | 2 +- .../TwitterJsonActivitySerializer.java | 3 + .../TwitterJsonUserActivitySerializer.java | 72 ++++++++++++++++++++ .../serializer/util/TwitterActivityUtil.java | 22 ++++++ 4 files changed, 98 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
