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

STORM-1276: line for line translation of nimbus to java


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

Branch: refs/heads/master
Commit: b91046684d0d1fc40e37471e0b8b00750bf1fe69
Parents: 872d0a1 725003c
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Dec 1 14:02:39 2016 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Dec 1 14:02:39 2016 -0600

----------------------------------------------------------------------
 bin/storm.py                                    |    2 +-
 .../src/clj/org/apache/storm/converter.clj      |   37 +-
 .../src/clj/org/apache/storm/daemon/nimbus.clj  | 2533 ------------
 storm-core/src/clj/org/apache/storm/testing.clj |  137 +-
 .../src/clj/org/apache/storm/testing4j.clj      |    1 -
 storm-core/src/clj/org/apache/storm/ui/core.clj |   36 +-
 storm-core/src/clj/org/apache/storm/util.clj    |   12 +-
 storm-core/src/jvm/org/apache/storm/Config.java |    5 +-
 .../org/apache/storm/blobstore/BlobStore.java   |   38 +
 .../storm/cluster/IStormClusterState.java       |   78 +-
 .../storm/cluster/StormClusterStateImpl.java    |    4 +-
 .../org/apache/storm/daemon/StormCommon.java    |   33 +-
 .../org/apache/storm/daemon/nimbus/Nimbus.java  | 3729 ++++++++++++++++++
 .../storm/daemon/nimbus/TopologyActions.java    |   31 +
 .../storm/daemon/nimbus/TopologyResources.java  |   63 +
 .../daemon/nimbus/TopologyStateTransition.java  |   27 +
 .../storm/daemon/supervisor/BasicContainer.java |   14 +-
 .../org/apache/storm/daemon/worker/Worker.java  |   10 +-
 .../jvm/org/apache/storm/nimbus/NimbusInfo.java |    8 +-
 .../scheduler/SchedulerAssignmentImpl.java      |   16 +
 .../storm/scheduler/SupervisorDetails.java      |   20 +-
 .../apache/storm/security/auth/AuthUtils.java   |   34 +-
 .../security/auth/ShellBasedGroupsMapping.java  |   13 +-
 .../jvm/org/apache/storm/stats/StatsUtil.java   |   22 +-
 .../apache/storm/utils/BufferInputStream.java   |    3 +-
 .../jvm/org/apache/storm/utils/ConfigUtils.java |    4 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |   26 +-
 .../test/clj/org/apache/storm/cluster_test.clj  |    8 +-
 .../test/clj/org/apache/storm/nimbus_test.clj   |  731 ++--
 .../scheduler/multitenant_scheduler_test.clj    |   38 +-
 .../clj/org/apache/storm/scheduler_test.clj     |    4 +-
 .../apache/storm/security/auth/auth_test.clj    |   44 +-
 .../storm/security/auth/nimbus_auth_test.clj    |  114 +-
 33 files changed, 4669 insertions(+), 3206 deletions(-)
----------------------------------------------------------------------


Reply via email to