From 34bcf1b32b99c1fd353f4f4073c89fb2db395142 Mon Sep 17 00:00:00 2001
From: Dan Crankshaw <dscrankshaw@gmail.com>
Date: Tue, 19 Nov 2013 16:46:25 -0800
Subject: [PATCH] Re-added slaves file for compatibility with Spark

---
 .gitignore  | 2 --
 conf/slaves | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 conf/slaves

diff --git a/.gitignore b/.gitignore
index 57e26c4d37..e1f64a1133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@ 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/
diff --git a/conf/slaves b/conf/slaves
new file mode 100644
index 0000000000..da0a01343d
--- /dev/null
+++ b/conf/slaves
@@ -0,0 +1,2 @@
+# A Spark Worker will be started on each of the machines listed below.
+localhost
\ No newline at end of file
-- 
GitLab