aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-04-24 23:59:16 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-24 23:59:16 -0700
commitdc3b640a0ab3501b678b591be3e99fbcf3badbec (patch)
tree2865c2a3cef66f061d846f6a968725e83728271b /.gitignore
parent6e101f1183f92769779bc8ac14813c063bf1ff3f (diff)
downloadspark-dc3b640a0ab3501b678b591be3e99fbcf3badbec.tar.gz
spark-dc3b640a0ab3501b678b591be3e99fbcf3badbec.tar.bz2
spark-dc3b640a0ab3501b678b591be3e99fbcf3badbec.zip
SPARK-1619 Launch spark-shell with spark-submit
This simplifies the shell a bunch and passes all arguments through to spark-submit. There is a tiny incompatibility from 0.9.1 which is that you can't put `-c` _or_ `--cores`, only `--cores`. However, spark-submit will give a good error message in this case, I don't think many people used this, and it's a trivial change for users. Author: Patrick Wendell <pwendell@gmail.com> Closes #542 from pwendell/spark-shell and squashes the following commits: 9eb3e6f [Patrick Wendell] Updating Spark docs b552459 [Patrick Wendell] Andrew's feedback 97720fa [Patrick Wendell] Review feedback aa2900b [Patrick Wendell] SPARK-1619 Launch spark-shell with spark-submit
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index cd9f90d559..857e9feb95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ conf/java-opts
conf/spark-env.sh
conf/streaming-env.sh
conf/log4j.properties
+conf/spark-defaults.conf
docs/_site
docs/api
target/