spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shiva...@apache.org
Subject spark git commit: [SPARK-8637] [SPARKR] [HOTFIX] Fix packages argument, sparkSubmitBinName
Date Thu, 25 Jun 2015 17:56:03 GMT
Repository: spark
Updated Branches:
  refs/heads/master 2519dcc33 -> c392a9efa


[SPARK-8637] [SPARKR] [HOTFIX] Fix packages argument, sparkSubmitBinName

cc cafreeman

Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>

Closes #7022 from shivaram/sparkr-init-hotfix and squashes the following commits:

9178d15 [Shivaram Venkataraman] Fix packages argument, sparkSubmitBinName


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

Branch: refs/heads/master
Commit: c392a9efabcb1ec2a2c53f001ecdae33c245ba35
Parents: 2519dcc
Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Authored: Thu Jun 25 10:56:00 2015 -0700
Committer: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
Committed: Thu Jun 25 10:56:00 2015 -0700

----------------------------------------------------------------------
 R/pkg/R/client.R | 2 +-
 R/pkg/R/sparkR.R | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/c392a9ef/R/pkg/R/client.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/client.R b/R/pkg/R/client.R
index cf2e5dd..78c7a30 100644
--- a/R/pkg/R/client.R
+++ b/R/pkg/R/client.R
@@ -57,7 +57,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts,
pack
 }
 
 launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
-  sparkSubmitBin <- determineSparkSubmitBin()
+  sparkSubmitBinName <- determineSparkSubmitBin()
   if (sparkHome != "") {
     sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName)
   } else {

http://git-wip-us.apache.org/repos/asf/spark/blob/c392a9ef/R/pkg/R/sparkR.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index 8f81d56..633b869 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -132,7 +132,7 @@ sparkR.init <- function(
         sparkHome = sparkHome,
         jars = jars,
         sparkSubmitOpts = Sys.getenv("SPARKR_SUBMIT_ARGS", "sparkr-shell"),
-        sparkPackages = sparkPackages)
+        packages = sparkPackages)
     # wait atmost 100 seconds for JVM to launch
     wait <- 0.1
     for (i in 1:25) {


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


Mime
View raw message