diff options
| author | Josh Rosen <joshrosen@apache.org> | 2014-07-29 19:02:06 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-07-29 19:02:06 -0700 |
| commit | 22649b6cde8e18f043f122bce46f446174d00f6c (patch) | |
| tree | 461aea35e98279de0c20c25860ecde7ecd51c48b /core | |
| parent | 86534d0f5255362618c05a07b0171ec35c915822 (diff) | |
| download | spark-22649b6cde8e18f043f122bce46f446174d00f6c.tar.gz spark-22649b6cde8e18f043f122bce46f446174d00f6c.tar.bz2 spark-22649b6cde8e18f043f122bce46f446174d00f6c.zip | |
[SPARK-2305] [PySpark] Update Py4J to version 0.8.2.1
Author: Josh Rosen <joshrosen@apache.org>
Closes #1626 from JoshRosen/SPARK-2305 and squashes the following commits:
03fb283 [Josh Rosen] Update Py4J to version 0.8.2.1.
Diffstat (limited to 'core')
| -rw-r--r-- | core/pom.xml | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml index a24743495b..4f061099a4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -275,7 +275,7 @@ <dependency> <groupId>net.sf.py4j</groupId> <artifactId>py4j</artifactId> - <version>0.8.1</version> + <version>0.8.2.1</version> </dependency> </dependencies> <build> diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala index 6d3e257c4d..52c70712ee 100644 --- a/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala +++ b/core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala @@ -29,7 +29,7 @@ private[spark] object PythonUtils { val pythonPath = new ArrayBuffer[String] for (sparkHome <- sys.env.get("SPARK_HOME")) { pythonPath += Seq(sparkHome, "python").mkString(File.separator) - pythonPath += Seq(sparkHome, "python", "lib", "py4j-0.8.1-src.zip").mkString(File.separator) + pythonPath += Seq(sparkHome, "python", "lib", "py4j-0.8.2.1-src.zip").mkString(File.separator) } pythonPath ++= SparkContext.jarOfObject(this) pythonPath.mkString(File.pathSeparator) |