You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/07/09 01:43:38 UTC
[4/5] storm git commit: Merge branch 'STORM-2503-1.1.x' into
1.1.x-branch
Merge branch 'STORM-2503-1.1.x' into 1.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/f70b832f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f70b832f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f70b832f
Branch: refs/heads/1.1.x-branch
Commit: f70b832f2f2dc8429fc4628511a62515b24b1811
Parents: e151d6d 0a39ad8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Jul 9 10:42:16 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Jul 9 10:42:16 2017 +0900
----------------------------------------------------------------------
.../storm/starter/TransactionalWords.java | 2 +-
.../daemon/supervisor/ReadClusterState.java | 2 +-
.../DefaultResourceAwareStrategy.java | 27 +++++---
.../StoreBasedTridentWindowManager.java | 2 +-
.../TestDefaultResourceAwareStrategy.java | 65 +++++---------------
5 files changed, 38 insertions(+), 60 deletions(-)
----------------------------------------------------------------------