apache/spark — pull request #846 by andrewor14 (2014-05-21 18:47:07+00:00)
Title: [SPARK-1896] Respect spark.master before MASTER in REPL

The hierarchy for the shell is as follows:
```
MASTER > --master > spark.master (spark-defaults.conf)
```
This is inconsistent with the way we run normal applications, which is:
```
--master > spark.master (spark-defaults.conf) > MASTER
```

I was trying to run a shell locally on a standalone cluster launched through the ec2 scripts, which automatically set `MASTER` in spark-env.sh. It was surprising to me that `--master` didn't take effect.