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/02/19 15:54:43 UTC
[07/10] storm git commit: Merge branch 'master' into Event-0216
Merge branch 'master' into Event-0216
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8b7536b3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8b7536b3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8b7536b3
Branch: refs/heads/master
Commit: 8b7536b34d7382f39c3b99319b5ffb703c9658ec
Parents: 588423a d0cd52b
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Fri Feb 19 14:55:18 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Fri Feb 19 14:55:18 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 2 +
bin/storm.py | 2 +-
.../org/apache/storm/command/healthcheck.clj | 90 -------------
.../clj/org/apache/storm/daemon/supervisor.clj | 4 +-
.../org/apache/storm/command/HealthCheck.java | 125 +++++++++++++++++++
5 files changed, 130 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8b7536b3/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index 6daf2cf,fad5b1a..33ae12a
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@@ -31,11 -31,10 +31,11 @@@
(:import [org.apache.storm Config])
(:import [org.apache.storm.generated WorkerResources ProfileAction LocalAssignment])
(:import [org.apache.storm.localizer LocalResource])
+ (:import [org.apache.storm.event EventManagerImp])
(:use [org.apache.storm.daemon common])
- (:require [org.apache.storm.command [healthcheck :as healthcheck]])
+ (:import [org.apache.storm.command HealthCheck])
(:require [org.apache.storm.daemon [worker :as worker]]
- [org.apache.storm [process-simulator :as psim] [cluster :as cluster] [event :as event]]
+ [org.apache.storm [process-simulator :as psim] [cluster :as cluster]]
[clojure.set :as set])
(:import [org.apache.thrift.transport TTransportException])
(:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms])