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 2016/03/13 02:44:57 UTC

[1/4] storm git commit: use '/usr/bin/env python' to check python version

Repository: storm
Updated Branches:
  refs/heads/master 9081a7d0f -> 71733add4


use '/usr/bin/env python' to check python version


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

Branch: refs/heads/master
Commit: 20f1497c213c97a8a72b2f43039ad59ce9ce5169
Parents: b477939
Author: 卫乐 <we...@taobao.com>
Authored: Wed Mar 9 16:05:04 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Wed Mar 9 16:05:04 2016 +0800

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


http://git-wip-us.apache.org/repos/asf/storm/blob/20f1497c/bin/storm
----------------------------------------------------------------------
diff --git a/bin/storm b/bin/storm
index 0963065..dfc5d8e 100755
--- a/bin/storm
+++ b/bin/storm
@@ -30,16 +30,8 @@ while [ -h "${PRG}" ]; do
   fi
 done
 
-# find python >= 2.6
-if [ -a /usr/bin/python2.6 ]; then
-  PYTHON=/usr/bin/python2.6
-fi
-
-if [ -z "$PYTHON" ]; then
-  PYTHON=/usr/bin/python
-fi
-
 # check for version
+PYTHON="/usr/bin/env python"
 majversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f1`
 minversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f2`
 numversion=$(( 10 * $majversion + $minversion))
@@ -71,4 +63,4 @@ if [ -f "${STORM_CONF_DIR}/storm-env.sh" ]; then
   . "${STORM_CONF_DIR}/storm-env.sh"
 fi
 
-exec "$PYTHON" "${STORM_BIN_DIR}/storm.py" "$@"
+exec "${STORM_BIN_DIR}/storm.py" "$@"


[4/4] storm git commit: Added STORM-1605 to CHANGELOG.

Posted by sr...@apache.org.
Added STORM-1605 to CHANGELOG.


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

Branch: refs/heads/master
Commit: 71733add446d426a8909f576a1ce0f0654bc1e37
Parents: 7ca2dd5
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sat Mar 12 17:44:22 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sat Mar 12 17:44:22 2016 -0800

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/71733add/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4912f04..3258f7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 2.0.0
+ * STORM-1605: use '/usr/bin/env python' to check python version
  * STORM-1618: Add the option of passing config directory
  * STORM-1269: port backtype.storm.daemon.common to java
  * STORM-1270: port drpc to java


[2/4] storm git commit: use '/usr/bin/env python' in storm.py

Posted by sr...@apache.org.
use '/usr/bin/env python' in storm.py


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

Branch: refs/heads/master
Commit: 686c63f0f26c89b434e2d9de77c0f8f987292c75
Parents: 20f1497
Author: 卫乐 <we...@taobao.com>
Authored: Thu Mar 10 10:33:17 2016 +0800
Committer: 卫乐 <we...@taobao.com>
Committed: Thu Mar 10 10:33:17 2016 +0800

----------------------------------------------------------------------
 bin/storm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/686c63f0/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 997989a..33fe026 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file


[3/4] storm git commit: Merge branch 'STORM-1605' of https://github.com/unsleepy22/storm into STORM-1605

Posted by sr...@apache.org.
Merge branch 'STORM-1605' of https://github.com/unsleepy22/storm into STORM-1605


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

Branch: refs/heads/master
Commit: 7ca2dd5e17da4ae10a69baadc5deda5264fa49ad
Parents: 9081a7d 686c63f
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sat Mar 12 17:43:36 2016 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sat Mar 12 17:43:36 2016 -0800

----------------------------------------------------------------------
 bin/storm    | 12 ++----------
 bin/storm.py |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/7ca2dd5e/bin/storm
----------------------------------------------------------------------