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:52 UTC
[2/3] storm git commit: Merge branch 'STORM-2216-1.x-merge' into
1.x-branch
Merge branch 'STORM-2216-1.x-merge' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/33642f7d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/33642f7d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/33642f7d
Branch: refs/heads/1.x-branch
Commit: 33642f7d42715733533b2a8f982d87a96ab778f1
Parents: ea8882c 89eda42
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Nov 25 10:07:26 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Nov 25 10:07:26 2016 +0900
----------------------------------------------------------------------
.../storm/kafka/monitor/KafkaOffsetLagUtil.java | 6 +++---
.../org/apache/storm/kafka/DynamicBrokersReader.java | 8 +++++---
.../src/jvm/org/apache/storm/kafka/ZkState.java | 2 +-
.../org/apache/storm/kinesis/spout/ZKConnection.java | 2 +-
.../src/jvm/org/apache/storm/drpc/ReturnResults.java | 14 +++++++++++---
.../org/apache/storm/multilang/JsonSerializer.java | 11 +++++------
.../org/apache/storm/task/GeneralTopologyContext.java | 11 +++++++----
.../org/apache/storm/topology/TopologyBuilder.java | 12 ++++++++++--
.../storm/trident/drpc/ReturnResultsReducer.java | 11 +++++++++--
.../trident/state/JSONNonTransactionalSerializer.java | 5 +++--
.../storm/trident/state/JSONOpaqueSerializer.java | 6 +++---
.../trident/state/JSONTransactionalSerializer.java | 6 +++---
.../org/apache/storm/trident/testing/TuplifyArgs.java | 14 +++++++++-----
.../trident/topology/state/TransactionalState.java | 2 +-
.../jvm/org/apache/storm/utils/TopologySpoutLag.java | 7 ++++++-
storm-core/src/jvm/org/apache/storm/utils/Utils.java | 4 +---
16 files changed, 78 insertions(+), 43 deletions(-)
----------------------------------------------------------------------