Merge branch 'port-scheduler-to-java' of https://github.com/vesense/storm into STORM-1232
STORM-1232: port backtype.storm.scheduler.DefaultScheduler to java STORM-1231: port backtype.storm.scheduler.EvenScheduler to java Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c03a12a9 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c03a12a9 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c03a12a9 Branch: refs/heads/master Commit: c03a12a98d1486b7268be9d1221b382b3ca2303c Parents: 4d15d4c 672c3c0 Author: Robert (Bobby) Evans <[email protected]> Authored: Wed Mar 16 09:44:58 2016 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Wed Mar 16 09:44:58 2016 -0500 ---------------------------------------------------------------------- .../src/clj/org/apache/storm/daemon/nimbus.clj | 2 +- .../apache/storm/scheduler/DefaultScheduler.clj | 80 --------- .../apache/storm/scheduler/EvenScheduler.clj | 98 ----------- .../storm/scheduler/IsolationScheduler.clj | 4 +- .../storm/scheduler/DefaultScheduler.java | 111 ++++++++++++ .../apache/storm/scheduler/EvenScheduler.java | 168 +++++++++++++++++++ .../apache/storm/scheduler/TopologyDetails.java | 3 +- .../src/jvm/org/apache/storm/utils/Utils.java | 21 ++- .../clj/org/apache/storm/scheduler_test.clj | 34 ++-- 9 files changed, 322 insertions(+), 199 deletions(-) ----------------------------------------------------------------------
