You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/12/21 18:50:24 UTC

[2/2] storm git commit: Merge branch 'STORM-3276' of github.com:revans2/incubator-storm into STORM-3276

Merge branch 'STORM-3276' of github.com:revans2/incubator-storm into STORM-3276

STORM-3276: Updated Flux to deal with storm local correctly

This closes #2908


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/074fb35a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/074fb35a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/074fb35a

Branch: refs/heads/master
Commit: 074fb35a0a5ab746d5508d2a60b48a7948a2cdda
Parents: cf00a53 095bdbc
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Dec 21 12:20:57 2018 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Dec 21 12:20:57 2018 -0600

----------------------------------------------------------------------
 bin/storm.py                                    | 13 +++-
 flux/README.md                                  | 60 +++++-------------
 .../main/java/org/apache/storm/flux/Flux.java   | 47 +++++++-------
 .../java/org/apache/storm/LocalCluster.java     | 66 ++++++++++++++++----
 4 files changed, 106 insertions(+), 80 deletions(-)
----------------------------------------------------------------------