Skip to content

Commit

Permalink
[SPARK-8063][SPARKR] Spark master URL conflict between MASTER env var…
Browse files Browse the repository at this point in the history
…iable and --master command line option.
  • Loading branch information
Sun Rui committed Jun 3, 2015
1 parent 0f80990 commit 51ca48b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion R/pkg/inst/profile/shell.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 51ca48b

Please sign in to comment.