Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D956310E55 for ; Wed, 19 Nov 2014 20:50:36 +0000 (UTC) Received: (qmail 50585 invoked by uid 500); 19 Nov 2014 20:50:36 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 50565 invoked by uid 500); 19 Nov 2014 20:50:36 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 50555 invoked by uid 99); 19 Nov 2014 20:50:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 20:50:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Nov 2014 20:50:14 +0000 Received: (qmail 49423 invoked by uid 99); 19 Nov 2014 20:50:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Nov 2014 20:50:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A88A8945310; Wed, 19 Nov 2014 20:50:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rebanks@apache.org To: commits@streams.incubator.apache.org Date: Wed, 19 Nov 2014 20:50:14 -0000 Message-Id: In-Reply-To: <810cf4d2bd1b4001a9a5bb805ff6468a@git.apache.org> References: <810cf4d2bd1b4001a9a5bb805ff6468a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-streams git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-streams X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Wed Nov 19 14:48:19 2014 -0600 Committer: Ryan Ebanks 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(-) ----------------------------------------------------------------------