You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/06/26 18:51:27 UTC
[1/3] storm git commit: Upmerge, and address code comment
Repository: storm
Updated Branches:
refs/heads/master 28e64c9e5 -> 577e34e7e
Upmerge, and address code comment
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/74f243cd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/74f243cd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/74f243cd
Branch: refs/heads/master
Commit: 74f243cd6ac154c2557b936f7d95c7f29a88594a
Parents: a55bbbe
Author: Paul Poulosky <pp...@yahoo-inc.com>
Authored: Wed Jun 3 12:21:06 2015 -0500
Committer: Paul Poulosky <pp...@yahoo-inc.com>
Committed: Wed Jun 3 12:21:06 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/74f243cd/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 455a4c0..dbf84b8 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -85,6 +85,9 @@ CONFFILE = ""
JAR_JVM_OPTS = shlex.split(os.getenv('STORM_JAR_JVM_OPTS', ''))
JAVA_HOME = os.getenv('JAVA_HOME', None)
JAVA_CMD = 'java' if not JAVA_HOME else os.path.join(JAVA_HOME, 'bin', 'java')
+if JAVA_HOME and not os.path.exists(JAVA_CMD):
+ print "ERROR: JAVA_HOME is invalid. Could not find bin/java at %s." % JAVA_HOME
+ sys.exit(1)
STORM_EXT_CLASSPATH = os.getenv('STORM_EXT_CLASSPATH', None)
STORM_EXT_CLASSPATH_DAEMON = os.getenv('STORM_EXT_CLASSPATH_DAEMON', None)
[2/3] storm git commit: Merge branch 'STORM-477' of
https://github.com/ppoulosk/storm
Posted by ki...@apache.org.
Merge branch 'STORM-477' of https://github.com/ppoulosk/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dad54fc4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dad54fc4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dad54fc4
Branch: refs/heads/master
Commit: dad54fc4a719cea47d1116ce57ba14360b38cac2
Parents: 28e64c9 74f243c
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Jun 26 11:39:57 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Jun 26 11:39:57 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/dad54fc4/bin/storm.py
----------------------------------------------------------------------
[3/3] storm git commit: Add STORM-477 to Changelog and README
Posted by ki...@apache.org.
Add STORM-477 to Changelog and README
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/577e34e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/577e34e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/577e34e7
Branch: refs/heads/master
Commit: 577e34e7ee39d7010d8e8e0447619896a406eaeb
Parents: dad54fc
Author: Kishor Patil <kp...@yahoo-inc.com>
Authored: Fri Jun 26 11:43:30 2015 -0500
Committer: Kishor Patil <kp...@yahoo-inc.com>
Committed: Fri Jun 26 11:43:30 2015 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
README.markdown | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/577e34e7/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6af6ec6..09995a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
* STORM-847: Add cli to get the last storm error from the topology
* STORM-864: Exclude storm-kafka tests from Travis CI build
* STORM-860: UI: while topology is transitioned to killed, "Activate" button is enabled but not functioning
+ * STORM-477: Add warning for invalid JAVA_HOME
## 0.10.0-beta
* STORM-867: fix bug with mk-ssl-connector
http://git-wip-us.apache.org/repos/asf/storm/blob/577e34e7/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 2757c33..68bea2d 100644
--- a/README.markdown
+++ b/README.markdown
@@ -200,6 +200,7 @@ under the License.
* jangie ([@jangie](https://github.com/jangie))
* Hailei Zhang ([@Hailei](https://github.com/Hailei))
* Nikhil Singh ([@snikhil5](https://github.com/snikhil5))
+* Paul Poulosky ([@ppoulosk](https://github.com/ppoulosk))
## Acknowledgements