You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/11/25 01:20:46 UTC
[2/3] storm git commit: Merge branch 'STORM-2216' of
https://github.com/revans2/incubator-storm into STORM-2216-merge
Merge branch 'STORM-2216' of https://github.com/revans2/incubator-storm into STORM-2216-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/983227f9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/983227f9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/983227f9
Branch: refs/heads/master
Commit: 983227f9a44051b8ad14ec4b58d852841c6b5a31
Parents: 89311db d41704e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Nov 25 00:40:41 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Nov 25 00:40:41 2016 +0900
----------------------------------------------------------------------
.../storm/kafka/monitor/KafkaOffsetLagUtil.java | 6 +++---
.../apache/storm/kafka/DynamicBrokersReader.java | 8 +++++---
.../src/jvm/org/apache/storm/kafka/ZkState.java | 2 +-
.../apache/storm/kinesis/spout/ZKConnection.java | 2 +-
.../jvm/org/apache/storm/daemon/StormCommon.java | 16 ++++++++++------
.../jvm/org/apache/storm/drpc/ReturnResults.java | 14 +++++++++++---
.../src/jvm/org/apache/storm/executor/Executor.java | 7 ++++++-
.../org/apache/storm/multilang/JsonSerializer.java | 11 +++++------
.../apache/storm/task/GeneralTopologyContext.java | 11 +++++++----
.../org/apache/storm/topology/TopologyBuilder.java | 12 ++++++++++--
.../storm/trident/drpc/ReturnResultsReducer.java | 11 +++++++++--
.../state/JSONNonTransactionalSerializer.java | 5 +++--
.../storm/trident/state/JSONOpaqueSerializer.java | 6 +++---
.../trident/state/JSONTransactionalSerializer.java | 6 +++---
.../apache/storm/trident/testing/TuplifyArgs.java | 14 +++++++++-----
.../trident/topology/state/TransactionalState.java | 2 +-
.../org/apache/storm/utils/TopologySpoutLag.java | 7 ++++++-
.../src/jvm/org/apache/storm/utils/Utils.java | 4 +---
18 files changed, 94 insertions(+), 50 deletions(-)
----------------------------------------------------------------------