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 2014/08/28 22:03:53 UTC

[41/50] git commit: Merge branch 'STORM-274' of https://github.com/sureshms/incubator-storm into STORM-274

Merge branch 'STORM-274' of https://github.com/sureshms/incubator-storm into STORM-274

STORM-274: Add support for command remoteconfvalue in storm.cmd

Conflicts:
	bin/storm.cmd


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

Branch: refs/heads/security
Commit: 4042b9dea8c8bb647c5860ecfc257fb3ad22acf3
Parents: 2b4cbe9 cee992a
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Aug 25 12:50:32 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Aug 25 12:50:32 2014 -0500

----------------------------------------------------------------------
 bin/storm.cmd | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/4042b9de/bin/storm.cmd
----------------------------------------------------------------------
diff --cc bin/storm.cmd
index 17c01d6,8f16107..359acb6
--- a/bin/storm.cmd
+++ b/bin/storm.cmd
@@@ -55,7 -55,7 +55,7 @@@
      goto :eof
    )
  
-   set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus logviewer rebalance repl shell supervisor ui
 -  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus rebalance remoteconfvalue repl shell supervisor ui
++  set corecommands=activate deactivate dev-zookeeper drpc kill list nimbus logviewer rebalance remoteconfvalue repl shell supervisor ui
    for %%i in ( %corecommands% ) do (
      if %storm-command% == %%i set corecommand=true  
    )