spark-instrumented-optimizer/R/pkg/inst/profile
Sun Rui 708c63bbbe [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.
2015-06-03 11:56:35 -07:00
..
general.R [SPARK-5654] Integrate SparkR 2015-04-08 22:45:40 -07:00
shell.R [SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option. 2015-06-03 11:56:35 -07:00