You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/21 20:35:09 UTC
[2/9] incubator-streams git commit: Merge remote-tracking branch
'apache/master' into dropwizard
Merge remote-tracking branch 'apache/master' into dropwizard
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e6112906
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e6112906
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e6112906
Branch: refs/heads/STREAMS-222
Commit: e6112906772aa5909e09f7246005e0caef5afff5
Parents: a57c017 1b55741
Author: sblackmon <sb...@apache.org>
Authored: Wed Nov 19 16:26:18 2014 -0600
Committer: sblackmon <sb...@apache.org>
Committed: Wed Nov 19 16:26:18 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 ++-
.../tasks/BroadcastMonitorThread.java | 5 +-
.../org/apache/streams/pojo/json/Broadcast.json | 8 +++
.../local/builders/LocalStreamBuilder.java | 37 +++++++++++---
.../streams/local/builders/StreamComponent.java | 31 +++++++-----
.../local/counters/DatumStatusCounter.java | 9 +++-
.../local/counters/StreamsTaskCounter.java | 16 ++++--
.../streams/local/queues/ThroughputQueue.java | 52 +++++++++++++++++---
.../streams/local/tasks/BaseStreamsTask.java | 41 ++++++++++++++-
.../streams/local/tasks/StreamsMergeTask.java | 7 ++-
.../local/tasks/StreamsPersistWriterTask.java | 11 +++--
.../local/tasks/StreamsProcessorTask.java | 14 ++++--
.../local/tasks/StreamsProviderTask.java | 11 +++--
.../local/builders/LocalStreamBuilderTest.java | 9 ++--
.../local/counters/DatumStatusCounterTest.java | 22 ++++-----
.../local/counters/StreamsTaskCounterTest.java | 21 ++++----
.../queues/ThroughputQueueMulitThreadTest.java | 5 +-
.../queues/ThroughputQueueSingleThreadTest.java | 15 +++---
.../streams/local/tasks/BasicTasksTest.java | 6 +--
.../local/tasks/StreamsProviderTaskTest.java | 10 ++--
.../streams/storm/trident/StreamsTopology.java | 2 +-
27 files changed, 315 insertions(+), 128 deletions(-)
----------------------------------------------------------------------