Merge branch 'master' into partitioners

639e27a3 · Dan Crankshaw · 5f3ee537 · 87dbb3cb · 639e27a3 · 5f3ee537
Commit 639e27a3 authored 11 years ago by Dan Crankshaw
--- 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
-# A Spark Worker will be started on each of the machines listed below.
-localhost
\ No newline at end of file