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/05/20 00:06:29 UTC
[4/5] git commit: Merge branch 'STORM-295' of
https://github.com/sureshms/incubator-storm into STORM-295
Merge branch 'STORM-295' of https://github.com/sureshms/incubator-storm into STORM-295
Conflicts:
bin/storm
STORM-295: Add storm configuration to define JAVA_HOME
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d1159e34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d1159e34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d1159e34
Branch: refs/heads/master
Commit: d1159e34c1292f7861bd96cdee508d986a50d276
Parents: a09adda 8e0a976
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon May 19 17:01:55 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon May 19 17:01:55 2014 -0500
----------------------------------------------------------------------
bin/storm | 37 ++++++++++++++------
conf/storm_env.ini | 30 ++++++++++++++++
.../clj/backtype/storm/daemon/supervisor.clj | 10 +++++-
.../test/clj/backtype/storm/supervisor_test.clj | 2 +-
storm-dist/binary/src/main/assembly/binary.xml | 5 +++
5 files changed, 71 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d1159e34/bin/storm
----------------------------------------------------------------------
diff --cc bin/storm
index bb6e40a,29df240..c9885a2
--- a/bin/storm
+++ b/bin/storm
@@@ -20,10 -20,9 +20,10 @@@ import o
import sys
import random
import subprocess as sub
- import getopt
import re
import shlex
+import urllib
+ import ConfigParser
def identity(x):
return x
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d1159e34/storm-core/src/clj/backtype/storm/daemon/supervisor.clj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d1159e34/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------