aboutsummaryrefslogtreecommitdiff
path: root/conf/slaves
diff options
context:
space:
mode:
authorJoseph E. Gonzalez <joseph.e.gonzalez@gmail.com>2013-10-13 20:43:23 -0700
committerJoseph E. Gonzalez <joseph.e.gonzalez@gmail.com>2013-10-13 20:43:23 -0700
commit141c22e28c04aa77377e525dc8dde58b628d4cca (patch)
tree6da7f6f1e2e86091ad59a12a90f874492a53e407 /conf/slaves
parent637b67da565cac4bda4c4e9bf4d3cfabb53ce46f (diff)
downloadspark-141c22e28c04aa77377e525dc8dde58b628d4cca.tar.gz
spark-141c22e28c04aa77377e525dc8dde58b628d4cca.tar.bz2
spark-141c22e28c04aa77377e525dc8dde58b628d4cca.zip
merging in master changes
Diffstat (limited to 'conf/slaves')
-rw-r--r--conf/slaves12
1 files changed, 2 insertions, 10 deletions
diff --git a/conf/slaves b/conf/slaves
index 728d22ac2e..da0a01343d 100644
--- a/conf/slaves
+++ b/conf/slaves
@@ -1,10 +1,2 @@
-ec2-23-20-12-62.compute-1.amazonaws.com
-ec2-54-205-173-19.compute-1.amazonaws.com
-ec2-54-225-4-124.compute-1.amazonaws.com
-ec2-23-22-209-112.compute-1.amazonaws.com
-ec2-50-16-69-88.compute-1.amazonaws.com
-ec2-54-205-163-126.compute-1.amazonaws.com
-ec2-54-242-235-95.compute-1.amazonaws.com
-ec2-54-211-169-232.compute-1.amazonaws.com
-ec2-54-237-31-30.compute-1.amazonaws.com
-ec2-54-235-15-124.compute-1.amazonaws.com
+# A Spark Worker will be started on each of the machines listed below.
+localhost \ No newline at end of file