From d19f2e8f3e094a38b9f2d62c6334ad231fe6d74b Mon Sep 17 00:00:00 2001 From: Dan Crankshaw Date: Tue, 12 Nov 2013 05:21:34 +0000 Subject: [PATCH 1/2] Removed slaves from git --- conf/slaves | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 conf/slaves diff --git a/conf/slaves b/conf/slaves deleted file mode 100644 index da0a01343d..0000000000 --- a/conf/slaves +++ /dev/null @@ -1,2 +0,0 @@ -# A Spark Worker will be started on each of the machines listed below. -localhost \ No newline at end of file From fa8a53619b91623c23b6939ca38aafbfc8ec14a0 Mon Sep 17 00:00:00 2001 From: Dan Crankshaw Date: Thu, 14 Nov 2013 00:17:00 +0000 Subject: [PATCH 2/2] Added conf file to gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e1f64a1133..57e26c4d37 100644 --- 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/