Merge branch '1230' of https://github.com/zhuoliu/storm into STORM-1230
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7562da30 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7562da30 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7562da30 Branch: refs/heads/master Commit: 7562da30b8af433a5531e251fc778c6b9d8f1c88 Parents: 4ca7522 f0b91a1 Author: zhuol <[email protected]> Authored: Mon Feb 22 17:02:16 2016 -0600 Committer: zhuol <[email protected]> Committed: Mon Feb 22 17:02:16 2016 -0600 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/supervisor.clj | 8 +- .../clj/org/apache/storm/process_simulator.clj | 49 ------------ storm-core/src/clj/org/apache/storm/testing.clj | 11 +-- .../jvm/org/apache/storm/ProcessSimulator.java | 82 ++++++++++++++++++++ 4 files changed, 92 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
