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/13 06:10:10 UTC
[43/43] incubator-streams git commit: Merge commit
'6f1bbec7992dcc3ea92e313cd5c4d99291a931e0'
Merge commit '6f1bbec7992dcc3ea92e313cd5c4d99291a931e0'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/853d01c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/853d01c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/853d01c5
Branch: refs/heads/master
Commit: 853d01c57019a1add6163647fab3ec70ae830c0e
Parents: 0ffc40e 6f1bbec
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Wed Nov 12 22:38:01 2014 -0600
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Wed Nov 12 22:38:01 2014 -0600
----------------------------------------------------------------------
streams-pojo/pom.xml | 5 ++
.../jackson/DatumStatusCounterDeserializer.java | 76 +++++++++++++++++
.../jackson/MemoryUsageDeserializer.java | 79 +++++++++++++++++
.../jackson/StreamsTaskCounterDeserializer.java | 88 +++++++++++++++++++
.../jackson/ThroughputQueueDeserializer.java | 87 +++++++++++++++++++
.../org/apache/streams/pojo/json/Broadcast.json | 13 +++
.../pojo/json/DatumStatusCounterBroadcast.json | 22 +++++
.../streams/pojo/json/MemoryUsageBroadcast.json | 30 +++++++
.../pojo/json/StreamsTaskCounterBroadcast.json | 38 +++++++++
.../pojo/json/ThroughputQueueBroadcast.json | 38 +++++++++
.../jackson/MemoryUsageDeserializerTest.java | 77 +++++++++++++++++
.../src/test/resources/MemoryUsageObjects.json | 1 +
.../local/builders/LocalStreamBuilder.java | 11 ++-
.../local/tasks/BroadcastMonitorThread.java | 90 ++++++++++++++++++++
14 files changed, 651 insertions(+), 4 deletions(-)
----------------------------------------------------------------------