Merge branch 'STORM-2110' of https://github.com/revans2/incubator-storm into STORM-2110
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/edd0c73d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/edd0c73d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/edd0c73d Branch: refs/heads/master Commit: edd0c73d71dceeeb0e2d645a8d96da8fc1c13aa3 Parents: 3a16070 874e730 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Fri Sep 23 10:43:33 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Fri Sep 23 10:43:33 2016 +0900 ---------------------------------------------------------------------- .../jvm/org/apache/storm/daemon/supervisor/BasicContainer.java | 6 +++++- .../org/apache/storm/daemon/supervisor/BasicContainerTest.java | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
