Merge branch 'STORM-2958' of https://github.com/roshannaik/storm into STORM-2958-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dc4011cd Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dc4011cd Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dc4011cd Branch: refs/heads/master Commit: dc4011cd69436d1fa43033c085f79bc91af7ee22 Parents: 4721c36 5199788 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Feb 20 14:23:36 2018 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Feb 20 14:23:36 2018 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 8 ++- docs/Performance.md | 27 ++++----- .../src/jvm/org/apache/storm/Config.java | 58 +++++++++++++++----- .../storm/executor/bolt/BoltExecutor.java | 1 - .../storm/executor/spout/SpoutExecutor.java | 35 ++++++------ .../org/apache/storm/policy/IWaitStrategy.java | 2 +- .../apache/storm/policy/WaitStrategyPark.java | 4 +- .../storm/policy/WaitStrategyProgressive.java | 8 ++- .../apache/storm/spout/ISpoutWaitStrategy.java | 34 ------------ .../storm/spout/NothingEmptyEmitStrategy.java | 31 ----------- .../storm/spout/SleepSpoutWaitStrategy.java | 41 -------------- 11 files changed, 92 insertions(+), 157 deletions(-) ----------------------------------------------------------------------