You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/10 05:30:05 UTC

[2/3] git commit: Small fix suggested by josh

Small fix suggested by josh


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/77ca9e1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/77ca9e1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/77ca9e1b

Branch: refs/heads/master
Commit: 77ca9e1ba845c8cbb1566f803b591f6a826b0f1d
Parents: 82a1d38
Author: Patrick Wendell <pw...@gmail.com>
Authored: Thu Jan 9 18:41:00 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Jan 9 18:41:00 2014 -0800

----------------------------------------------------------------------
 bin/pyspark | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/77ca9e1b/bin/pyspark
----------------------------------------------------------------------
diff --git a/bin/pyspark b/bin/pyspark
index a70da56..ed6f8da 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -51,6 +51,7 @@ export PYSPARK_PYTHON
 export PYTHONPATH=$SPARK_HOME/python/:$PYTHONPATH
 
 # Load the PySpark shell.py script when ./pyspark is used interactively:
+export OLD_PYTHONSTARTUP=$PYTHONSTARTUP
 export PYTHONSTARTUP=$FWDIR/python/pyspark/shell.py
 
 if [ -n "$IPYTHON_OPTS" ]; then