spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: Slaves file is now a template.
Date Sat, 27 Sep 2014 05:22:10 GMT
Repository: spark
Updated Branches:
  refs/heads/master a3feaf04d -> e976ca236


Slaves file is now a template.

Change 0dc868e removed the `conf/slaves` file and made it a template like most of the other
configuration files. This means you can no longer run `make-distribution.sh` unless you manually
create a slaves file to be statically bundled in your distribution, which seems at odds with
making it a template file.

Author: Sarah Gerweck <sarah.a180@gmail.com>

Closes #2549 from sarahgerweck/noMoreSlaves and squashes the following commits:

d11d99a [Sarah Gerweck] Slaves file is now a template.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e976ca23
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e976ca23
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e976ca23

Branch: refs/heads/master
Commit: e976ca236f3c5578d8d7639b788774b1053b65f7
Parents: a3feaf0
Author: Sarah Gerweck <sarah.a180@gmail.com>
Authored: Fri Sep 26 22:21:50 2014 -0700
Committer: Reynold Xin <rxin@apache.org>
Committed: Fri Sep 26 22:21:50 2014 -0700

----------------------------------------------------------------------
 make-distribution.sh | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/e976ca23/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 8846599..0bc839e 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -201,7 +201,6 @@ fi
 # Copy other things
 mkdir "$DISTDIR"/conf
 cp "$FWDIR"/conf/*.template "$DISTDIR"/conf
-cp "$FWDIR"/conf/slaves "$DISTDIR"/conf
 cp "$FWDIR/README.md" "$DISTDIR"
 cp -r "$FWDIR/bin" "$DISTDIR"
 cp -r "$FWDIR/python" "$DISTDIR"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message