diff options
| author | Sun Rui <rui.sun@intel.com> | 2015-06-03 11:56:35 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@cs.berkeley.edu> | 2015-06-03 11:56:35 -0700 |
| commit | 708c63bbbe9580eb774fe47e23ef61338103afda (patch) | |
| tree | c2964de8d1c159d515a4c39d94410ef1c026fdda /R/pkg | |
| parent | d2a86eb8f0fcc02304604da56c589ea58c77587a (diff) | |
| download | spark-708c63bbbe9580eb774fe47e23ef61338103afda.tar.gz spark-708c63bbbe9580eb774fe47e23ef61338103afda.tar.bz2 spark-708c63bbbe9580eb774fe47e23ef61338103afda.zip | |
[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.
Diffstat (limited to 'R/pkg')
| -rw-r--r-- | R/pkg/inst/profile/shell.R | 2 |
1 files changed, 1 insertions, 1 deletions
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) |