From 708c63bbbe9580eb774fe47e23ef61338103afda Mon Sep 17 00:00:00 2001
From: Sun Rui <rui.sun@intel.com>
Date: Wed, 3 Jun 2015 11:56:35 -0700
Subject: [PATCH] [SPARK-8063] [SPARKR] Spark master URL conflict between
MASTER env variable and --master command line option.
Author: Sun Rui <rui.sun@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.
---
R/pkg/inst/profile/shell.R | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/R/pkg/inst/profile/shell.R b/R/pkg/inst/profile/shell.R
index ca94f1d4e7..773b6ecf58 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)
--
GitLab