You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/01/05 16:24:30 UTC
[4/5] storm git commit: Merge branch 'storm-1427' of
https://github.com/caofangkun/apache-storm into STORM-1427
Merge branch 'storm-1427' of https://github.com/caofangkun/apache-storm into STORM-1427
STORM-1427: add TupleUtils/listHashCode method and delete tuple.clj
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ee5852c7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ee5852c7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ee5852c7
Branch: refs/heads/master
Commit: ee5852c77ec6b0b236ae4eda596cae9101e2a567
Parents: dd85231 ce69a7c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Tue Jan 5 09:12:22 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Tue Jan 5 09:12:22 2016 -0600
----------------------------------------------------------------------
.../src/clj/backtype/storm/daemon/executor.clj | 6 ++---
.../src/clj/backtype/storm/daemon/nimbus.clj | 7 +++---
storm-core/src/clj/backtype/storm/tuple.clj | 24 --------------------
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
.../jvm/backtype/storm/utils/TupleUtils.java | 11 +++++++++
5 files changed, 18 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ee5852c7/storm-core/src/clj/backtype/storm/daemon/executor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/executor.clj
index 7b54aed,95d16f4..25adc62
--- a/storm-core/src/clj/backtype/storm/daemon/executor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/executor.clj
@@@ -34,10 -34,9 +34,10 @@@
(:import [backtype.storm.daemon Shutdownable])
(:import [backtype.storm.metric.api IMetric IMetricsConsumer$TaskInfo IMetricsConsumer$DataPoint StateMetric])
(:import [backtype.storm Config Constants])
+ (:import [backtype.storm.cluster ClusterStateContext DaemonType])
(:import [backtype.storm.grouping LoadAwareCustomStreamGrouping LoadAwareShuffleGrouping LoadMapping ShuffleGrouping])
(:import [java.util.concurrent ConcurrentLinkedQueue])
- (:require [backtype.storm [tuple :as tuple] [thrift :as thrift]
+ (:require [backtype.storm [thrift :as thrift]
[cluster :as cluster] [disruptor :as disruptor] [stats :as stats]])
(:require [backtype.storm.daemon [task :as task]])
(:require [backtype.storm.daemon.builtin-metrics :as builtin-metrics])
http://git-wip-us.apache.org/repos/asf/storm/blob/ee5852c7/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------