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 2015/01/23 21:20:33 UTC

[09/10] storm git commit: Merge branch 'master' of https://github.com/taojoe/storm into STORM-630

Merge branch 'master' of https://github.com/taojoe/storm into STORM-630

STORM-630: Support for Clojure 1.6.0

Conflicts:
	storm-core/src/clj/backtype/storm/util.clj


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f57e3b64
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f57e3b64
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f57e3b64

Branch: refs/heads/master
Commit: f57e3b647c27b39fcb3daacc0427fc01393d9af7
Parents: 4e5c7cc 7dab18f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Jan 23 14:02:13 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Jan 23 14:02:13 2015 -0600

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/util.clj             | 6 +-----
 storm-core/test/clj/backtype/storm/supervisor_test.clj | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f57e3b64/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/f57e3b64/storm-core/test/clj/backtype/storm/supervisor_test.clj
----------------------------------------------------------------------