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:12 UTC
[1/3] incubator-streams git commit: Merge remote-tracking branch
'robdouglas/STREAMS-216'
Repository: incubator-streams
Updated Branches:
refs/heads/master 590b053b9 -> 1b5574142
Merge remote-tracking branch 'robdouglas/STREAMS-216'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/31ba80fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/31ba80fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/31ba80fc
Branch: refs/heads/master
Commit: 31ba80fcbe9d6728da3d7a6d67a5a1ef661e626d
Parents: 91dd9a3 a20f01a
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Wed Nov 19 13:40:08 2014 -0600
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Wed Nov 19 13:40:08 2014 -0600
----------------------------------------------------------------------
.../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 | 16 +++---
.../queues/ThroughputQueueSingleThreadTest.java | 15 +++---
.../streams/local/tasks/BasicTasksTest.java | 6 +--
.../local/tasks/StreamsProviderTaskTest.java | 10 ++--
18 files changed, 238 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
[3/3] incubator-streams git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-streams
Posted by re...@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 <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(-)
----------------------------------------------------------------------
[2/3] incubator-streams git commit: Merge remote-tracking branch
'robdouglas/STREAMS-216'
Posted by re...@apache.org.
Merge remote-tracking branch 'robdouglas/STREAMS-216'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/39622e2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/39622e2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/39622e2c
Branch: refs/heads/master
Commit: 39622e2c0cf42784015f1ecb64308c49ae5b9772
Parents: 31ba80f 8368755
Author: Ryan Ebanks <ry...@gmail.com>
Authored: Wed Nov 19 14:30:24 2014 -0600
Committer: Ryan Ebanks <ry...@gmail.com>
Committed: Wed Nov 19 14:30:24 2014 -0600
----------------------------------------------------------------------
.../local/counters/StreamsTaskCounterTest.java | 21 +++++++++++---------
.../queues/ThroughputQueueMulitThreadTest.java | 5 ++++-
2 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------