diff options
author | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
---|---|---|
committer | Prashant Sharma <scrapcodes@gmail.com> | 2013-09-15 10:55:12 +0530 |
commit | 383e151fd7138cc6a143b3a38037cc3038c2a8b9 (patch) | |
tree | 0dbb2c0d8fdeff4c37a577eb96acb87ee7838a16 /python/pyspark/shell.py | |
parent | 20c65bc334091d8d05fb680551155aa182d98f7d (diff) | |
parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
download | spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.gz spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.tar.bz2 spark-383e151fd7138cc6a143b3a38037cc3038c2a8b9.zip |
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts:
core/src/main/scala/org/apache/spark/SparkContext.scala
project/SparkBuild.scala
Diffstat (limited to 'python/pyspark/shell.py')
-rw-r--r-- | python/pyspark/shell.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 54823f8037..dc205b306f 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -24,6 +24,7 @@ import os import platform import pyspark from pyspark.context import SparkContext +from pyspark.storagelevel import StorageLevel # this is the equivalent of ADD_JARS add_files = os.environ.get("ADD_FILES").split(',') if os.environ.get("ADD_FILES") != None else None |