You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/12/07 20:05:59 UTC
[2/4] storm git commit: Merge branch
'storm-1364-deamons-log-version-on-start' of https://github.com/d2r/storm
into storm-1364-merge
Merge branch 'storm-1364-deamons-log-version-on-start' of https://github.com/d2r/storm into storm-1364-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4c31c274
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4c31c274
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4c31c274
Branch: refs/heads/master
Commit: 4c31c274af14a1b1960245994f03e33d06f192cb
Parents: 3600953 b52988a
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Mon Dec 7 12:53:38 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Mon Dec 7 12:53:38 2015 -0600
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/drpc.clj | 6 +++++-
storm-core/src/clj/backtype/storm/daemon/logviewer.clj | 6 +++++-
storm-core/src/clj/backtype/storm/daemon/nimbus.clj | 8 ++++++--
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 8 ++++++--
storm-core/src/clj/backtype/storm/ui/core.clj | 8 ++++++--
storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj | 8 ++++++--
6 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4c31c274/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4c31c274/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --cc storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index d85893b,e4ebddd..3acc348
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@@ -46,7 -44,10 +46,9 @@@
(defmulti download-storm-code cluster-mode)
(defmulti launch-worker (fn [supervisor & _] (cluster-mode (:conf supervisor))))
-(defmulti mk-code-distributor cluster-mode)
+ (def STORM-VERSION (VersionInfo/getVersion))
+
(defprotocol SupervisorDaemon
(get-id [this])
(get-conf [this])