Repository: spark
Updated Branches:
  refs/heads/master 320bca450 -> f63b44a5c


[SPARK-6894]spark.executor.extraLibraryOptions => 
spark.executor.extraLibraryPath

https://issues.apache.org/jira/browse/SPARK-6894

cc vanzin

Author: WangTaoTheTonic <wangtao...@huawei.com>

Closes #5506 from WangTaoTheTonic/SPARK-6894 and squashes the following commits:

4b7ced7 [WangTaoTheTonic] spark.executor.extraLibraryOptions => 
spark.executor.extraLibraryPath


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

Branch: refs/heads/master
Commit: f63b44a5c201d9678738a906462be9a6d7e3e8f8
Parents: 320bca4
Author: WangTaoTheTonic <wangtao...@huawei.com>
Authored: Tue Apr 14 12:02:11 2015 -0700
Committer: Andrew Or <and...@databricks.com>
Committed: Tue Apr 14 12:02:11 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/spark/launcher/SparkLauncher.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/f63b44a5/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java
----------------------------------------------------------------------
diff --git 
a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java 
b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java
index b566507..d4cfeac 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java
@@ -52,7 +52,7 @@ public class SparkLauncher {
   /** Configuration key for the executor VM options. */
   public static final String EXECUTOR_EXTRA_JAVA_OPTIONS = 
"spark.executor.extraJavaOptions";
   /** Configuration key for the executor native library path. */
-  public static final String EXECUTOR_EXTRA_LIBRARY_PATH = 
"spark.executor.extraLibraryOptions";
+  public static final String EXECUTOR_EXTRA_LIBRARY_PATH = 
"spark.executor.extraLibraryPath";
   /** Configuration key for the number of executor CPU cores. */
   public static final String EXECUTOR_CORES = "spark.executor.cores";
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to