You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@streams.apache.org by re...@apache.org on 2014/11/19 21:50:14 UTC

[3/3] incubator-streams git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-streams

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-streams


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1b557414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1b557414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/1b557414

Branch: refs/heads/master
Commit: 1b55741429947466b6606e2d5f2091881be90fc5
Parents: 39622e2 590b053
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Wed Nov 19 14:48:19 2014 -0600
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Wed Nov 19 14:48:19 2014 -0600

----------------------------------------------------------------------
 .../serializer/FacebookActivityUtil.java        |  2 +-
 .../gplus/provider/AbstractGPlusProvider.java   | 31 +++++++++++--------
 .../gplus/provider/GPlusConfigurator.java       | 32 ++++++++++----------
 .../provider/GPlusUserActivityProvider.java     | 11 +++++++
 .../gplus/provider/GPlusUserDataProvider.java   | 11 +++++++
 .../com/google/gplus/GPlusConfiguration.json    | 17 +++++------
 .../provider/TestAbstractGPlusProvider.java     |  7 ++---
 .../streams/storm/trident/StreamsTopology.java  |  2 +-
 8 files changed, 69 insertions(+), 44 deletions(-)
----------------------------------------------------------------------