aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorJagadeesan <as2@us.ibm.com>2016-10-21 09:48:24 +0100
committerSean Owen <sowen@cloudera.com>2016-10-21 09:48:24 +0100
commit595893d33a26c838c8c5c0c599fbee7fa61cbdff (patch)
treec67a8f79a7c81bd385c95d30aba903316ed765a7 /core/src
parent57e97fcbd6fe62af4acd60896feeacfa21efc222 (diff)
downloadspark-595893d33a26c838c8c5c0c599fbee7fa61cbdff.tar.gz
spark-595893d33a26c838c8c5c0c599fbee7fa61cbdff.tar.bz2
spark-595893d33a26c838c8c5c0c599fbee7fa61cbdff.zip
[SPARK-17960][PYSPARK][UPGRADE TO PY4J 0.10.4]
## What changes were proposed in this pull request? 1) Upgrade the Py4J version on the Java side 2) Update the py4j src zip file we bundle with Spark ## How was this patch tested? Existing doctests & unit tests pass Author: Jagadeesan <as2@us.ibm.com> Closes #15514 from jagadeesanas2/SPARK-17960.
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/scala/org/apache/spark/api/python/PythonUtils.scala2
1 files changed, 1 insertions, 1 deletions
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 701097ace8..c4e55b5e89 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
@@ -32,7 +32,7 @@ private[spark] object PythonUtils {
val pythonPath = new ArrayBuffer[String]
for (sparkHome <- sys.env.get("SPARK_HOME")) {
pythonPath += Seq(sparkHome, "python", "lib", "pyspark.zip").mkString(File.separator)
- pythonPath += Seq(sparkHome, "python", "lib", "py4j-0.10.3-src.zip").mkString(File.separator)
+ pythonPath += Seq(sparkHome, "python", "lib", "py4j-0.10.4-src.zip").mkString(File.separator)
}
pythonPath ++= SparkContext.jarOfObject(this)
pythonPath.mkString(File.pathSeparator)