diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-04-29 23:24:34 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-29 23:24:34 -0700 |
| commit | ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a (patch) | |
| tree | 5bd17eaa50b3120317370821104c9c6d9e238b56 /python/pyspark/__init__.py | |
| parent | 7025dda8fa84b57d6f12bc770df2fa10eef21d88 (diff) | |
| download | spark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.tar.gz spark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.tar.bz2 spark-ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a.zip | |
SPARK-1004. PySpark on YARN
This reopens https://github.com/apache/incubator-spark/pull/640 against the new repo
Author: Sandy Ryza <sandy@cloudera.com>
Closes #30 from sryza/sandy-spark-1004 and squashes the following commits:
89889d4 [Sandy Ryza] Move unzipping py4j to the generate-resources phase so that it gets included in the jar the first time
5165a02 [Sandy Ryza] Fix docs
fd0df79 [Sandy Ryza] PySpark on YARN
Diffstat (limited to 'python/pyspark/__init__.py')
| -rw-r--r-- | python/pyspark/__init__.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/python/pyspark/__init__.py b/python/pyspark/__init__.py index 73fe7378ff..07df8697bd 100644 --- a/python/pyspark/__init__.py +++ b/python/pyspark/__init__.py @@ -49,13 +49,6 @@ Hive: Main entry point for accessing data stored in Apache Hive.. """ - - -import sys -import os -sys.path.insert(0, os.path.join(os.environ["SPARK_HOME"], "python/lib/py4j-0.8.1-src.zip")) - - from pyspark.conf import SparkConf from pyspark.context import SparkContext from pyspark.sql import SQLContext |