Merge branch 'STORM-760' of https://github.com/revans2/incubator-storm into STORM-760
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/07f5e676 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/07f5e676 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/07f5e676 Branch: refs/heads/0.10.x-branch Commit: 07f5e6769ea35f8d680f937b3358176000ae8bdc Parents: 19e3a28 5f55c51 Author: Robert (Bobby) Evans <[email protected]> Authored: Thu Jun 4 13:51:40 2015 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Thu Jun 4 13:51:40 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/07f5e676/storm-core/src/clj/backtype/storm/daemon/nimbus.clj ----------------------------------------------------------------------
