You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2014/12/22 17:51:15 UTC

[2/3] storm git commit: Merge branch 'STORM-487' of https://github.com/HeartSaVioR/storm into STORM-487

Merge branch 'STORM-487' of https://github.com/HeartSaVioR/storm into STORM-487


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

Branch: refs/heads/master
Commit: d2d2db0285f138c3394d1e68d6a035377acdbc05
Parents: 527eb29 ed4861d
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Fri Dec 19 14:52:56 2014 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Fri Dec 19 14:52:56 2014 -0800

----------------------------------------------------------------------
 bin/storm | 59 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/d2d2db02/bin/storm
----------------------------------------------------------------------
diff --cc bin/storm
index 90f7634,553e82b..83f5a9f
--- a/bin/storm
+++ b/bin/storm
@@@ -211,20 -216,8 +216,20 @@@ def kill(*args)
          "backtype.storm.command.kill_topology", 
          args=args, 
          jvmtype="-client", 
-         extrajars=[USER_CONF_DIR, STORM_DIR + "/bin"])
+         extrajars=[USER_CONF_DIR, STORM_BIN_DIR])
  
 +
 +def upload_credentials(*args):
 +    """Syntax: [storm upload_credentials topology-name [credkey credvalue]*]
 +
 +    Uploads a new set of credentials to a running topology
 +    """
 +    exec_storm_class(
 +        "backtype.storm.command.upload_credentials", 
 +        args=args, 
 +        jvmtype="-client", 
 +        extrajars=[USER_CONF_DIR, STORM_DIR + "/bin"])
 +
  def activate(*args):
      """Syntax: [storm activate topology-name]