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/06/04 21:02:35 UTC

[2/3] storm git commit: Merge branch 'STORM-760' of https://github.com/revans2/incubator-storm into STORM-760-0.10

Merge branch 'STORM-760' of https://github.com/revans2/incubator-storm into STORM-760-0.10

STORM-760: Use JSON for serialized conf


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

Branch: refs/heads/0.10.x-branch
Commit: 7b57acbe21e5000bd26ebbc4f99746cbc07637e3
Parents: 4ad25ea 5f55c51
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Jun 4 13:42:59 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Jun 4 13:42:59 2015 -0500

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/config.clj    |  2 +-
 .../src/clj/backtype/storm/daemon/nimbus.clj    | 10 ++++----
 .../src/jvm/backtype/storm/utils/Utils.java     | 26 ++++++++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/7b57acbe/storm-core/src/clj/backtype/storm/daemon/nimbus.clj
----------------------------------------------------------------------