spark git commit: [SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.

2015-06-03 Thread shivaram
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 rui@intel.com Closes #6605 from sun-rui/SPARK-8063 and squashes the following

spark git commit: [SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option.

2015-06-03 Thread shivaram
Repository: spark Updated Branches: refs/heads/branch-1.4 0a1dad6cd - f67a27d02 [SPARK-8063] [SPARKR] Spark master URL conflict between MASTER env variable and --master command line option. Author: Sun Rui rui@intel.com Closes #6605 from sun-rui/SPARK-8063 and squashes the following