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/24 17:17:31 UTC
[21/27] storm git commit: Merge branch 'master' into ClusterUtils
Merge branch 'master' into ClusterUtils
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3717f393
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3717f393
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3717f393
Branch: refs/heads/master
Commit: 3717f3931e51825f16739cbed138e9789b7d1428
Parents: b7bc9bf 4ca7522
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Sun Feb 21 12:59:50 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Sun Feb 21 12:59:50 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 3 +
external/storm-hdfs/pom.xml | 23 ++---
.../clj/org/apache/storm/daemon/supervisor.clj | 48 +++++++---
storm-core/src/clj/org/apache/storm/event.clj | 71 --------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 6 +-
.../org/apache/storm/event/EventManager.java | 24 +++++
.../org/apache/storm/event/EventManagerImp.java | 97 ++++++++++++++++++++
7 files changed, 173 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3717f393/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index f429d09,21e5854..a6f3a62
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@@ -34,7 -35,7 +35,7 @@@
(:use [org.apache.storm.daemon common])
(:import [org.apache.storm.command HealthCheck])
(:require [org.apache.storm.daemon [worker :as worker]]
- [org.apache.storm [process-simulator :as psim] [event :as event]]
- [org.apache.storm [process-simulator :as psim] [cluster :as cluster]]
++ [org.apache.storm [process-simulator :as psim]]
[clojure.set :as set])
(:import [org.apache.thrift.transport TTransportException])
(:import [org.apache.zookeeper data.ACL ZooDefs$Ids ZooDefs$Perms])
http://git-wip-us.apache.org/repos/asf/storm/blob/3717f393/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------