Merge branch 'master' into partitioners

2013-11-18 22:18:59 -08:00 · 2013-11-18 22:18:59 -08:00 · 639e27a396
parent 5f3ee53751 87dbb3cb1e
commit 639e27a396
2 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,6 +14,8 @@ conf/java-opts
 conf/spark-env.sh
 conf/streaming-env.sh
 conf/log4j.properties
+conf/slaves
+conf/core-site.xml
 docs/_site
 docs/api
 target/
--- a/conf/slaves
+++ b/conf/slaves
@ -1,2 +0,0 @@
-# A Spark Worker will be started on each of the machines listed below.
-localhost