You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/06/03 20:56:51 UTC
spark git commit: [SPARK-8063] [SPARKR] Spark master URL conflict
between MASTER env variable and --master command line option.
Repository: spark
Updated Branches:
refs/heads/master d2a86eb8f -> 708c63bbb
[SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.
Author: Sun Rui <ru...@intel.com>
Closes #6605 from sun-rui/SPARK-8063 and squashes the following commits:
51ca48b [Sun Rui] [SPARK-8063][SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/708c63bb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/708c63bb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/708c63bb
Branch: refs/heads/master
Commit: 708c63bbbe9580eb774fe47e23ef61338103afda
Parents: d2a86eb
Author: Sun Rui <ru...@intel.com>
Authored: Wed Jun 3 11:56:35 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Wed Jun 3 11:56:35 2015 -0700
----------------------------------------------------------------------
R/pkg/inst/profile/shell.R | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/708c63bb/R/pkg/inst/profile/shell.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/profile/shell.R b/R/pkg/inst/profile/shell.R
index ca94f1d..773b6ec 100644
--- a/R/pkg/inst/profile/shell.R
+++ b/R/pkg/inst/profile/shell.R
@@ -24,7 +24,7 @@
old <- getOption("defaultPackages")
options(defaultPackages = c(old, "SparkR"))
- sc <- SparkR::sparkR.init(Sys.getenv("MASTER", unset = ""))
+ sc <- SparkR::sparkR.init()
assign("sc", sc, envir=.GlobalEnv)
sqlContext <- SparkR::sparkRSQL.init(sc)
assign("sqlContext", sqlContext, envir=.GlobalEnv)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org