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

STROM-1263: port backtype.storm.command.kill-topology to java
STORM-1260: port backtype.storm.command.activate to java
STORM-1261: port backtype.storm.command.deactivate to java
STORM-1264: port backtype.storm.command.list to java


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

Branch: refs/heads/master
Commit: 45178230c49d397eb89765e68ebc34802b80985c
Parents: a759db3 aca76e0
Author: Robert (Bobby) Evans <[email protected]>
Authored: Tue Feb 16 09:16:13 2016 -0600
Committer: Robert (Bobby) Evans <[email protected]>
Committed: Tue Feb 16 09:16:13 2016 -0600

----------------------------------------------------------------------
 bin/storm.cmd                                   |  20 +-
 bin/storm.py                                    |   8 +-
 pom.xml                                         |   6 +
 storm-core/pom.xml                              |   9 +
 .../clj/org/apache/storm/command/activate.clj   |  24 --
 .../clj/org/apache/storm/command/deactivate.clj |  24 --
 .../org/apache/storm/command/kill_topology.clj  |  29 --
 .../src/clj/org/apache/storm/command/list.clj   |  38 --
 .../jvm/org/apache/storm/command/Activate.java  |  40 +++
 .../src/jvm/org/apache/storm/command/CLI.java   | 353 +++++++++++++++++++
 .../org/apache/storm/command/Deactivate.java    |  40 +++
 .../org/apache/storm/command/KillTopology.java  |  51 +++
 .../src/jvm/org/apache/storm/command/List.java  |  50 +++
 .../org/apache/storm/utils/NimbusClient.java    |  19 +-
 .../jvm/org/apache/storm/command/TestCLI.java   |  59 ++++
 15 files changed, 640 insertions(+), 130 deletions(-)
----------------------------------------------------------------------


Reply via email to