Merge branch 'STORM-1664-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/afc67ff0 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/afc67ff0 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/afc67ff0 Branch: refs/heads/1.x-branch Commit: afc67ff017b61fd48bcad0b21b03a478bd018f02 Parents: 8cb2274 9bff5f4 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Fri Sep 23 10:58:49 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Fri Sep 23 10:58:49 2016 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/testing4j.clj | 6 ++++-- .../jvm/org/apache/storm/testing/MkClusterParam.java | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) ----------------------------------------------------------------------