You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/05/15 20:02:52 UTC
[10/13] storm git commit: fix merge conflict
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/155e52ad
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/155e52ad
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/155e52ad
Branch: refs/heads/0.10.x-branch
Commit: 155e52ad11f041788fb9718f2c767dfdd14a9b2d
Parents: 765354c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri May 15 13:42:58 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri May 15 13:42:58 2015 -0400
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/daemon/supervisor.clj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/155e52ad/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
index 7dc3085..9ff0c65 100644
--- a/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
@@ -512,7 +512,7 @@
(.getMetadata isupervisor)
(conf SUPERVISOR-SCHEDULER-META)
((:uptime supervisor))
- ((:version supervisor))))]
+ (:version supervisor))))]
(heartbeat-fn)