Merge branch 'STORM-1121' of https://github.com/kishorvpatil/incubator-storm into STORM-1121
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fd7cadd0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fd7cadd0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fd7cadd0 Branch: refs/heads/master Commit: fd7cadd0282d40b2e20506a4295daf29dcc23e0a Parents: 9de7922 404bb6a Author: Jungtaek Lim <kabh...@gmail.com> Authored: Sat Oct 24 10:02:28 2015 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Sat Oct 24 10:02:28 2015 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 1 - storm-core/src/clj/backtype/storm/config.clj | 1 + .../src/clj/backtype/storm/daemon/nimbus.clj | 5 +-- storm-core/src/clj/backtype/storm/testing.clj | 3 +- storm-core/src/jvm/backtype/storm/Config.java | 7 --- .../clj/backtype/storm/integration_test.clj | 8 +++- .../test/clj/backtype/storm/multilang_test.clj | 4 +- .../test/clj/backtype/storm/nimbus_test.clj | 45 ++++++++++++++------ .../test/clj/backtype/storm/supervisor_test.clj | 15 +++++-- .../test/clj/backtype/storm/testing4j_test.clj | 1 + .../clj/backtype/storm/transactional_test.clj | 5 ++- 11 files changed, 60 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fd7cadd0/storm-core/src/clj/backtype/storm/daemon/nimbus.clj ----------------------------------------------------------------------
