From e976ca236f3c5578d8d7639b788774b1053b65f7 Mon Sep 17 00:00:00 2001 From: Sarah Gerweck Date: Fri, 26 Sep 2014 22:21:50 -0700 Subject: 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 Closes #2549 from sarahgerweck/noMoreSlaves and squashes the following commits: d11d99a [Sarah Gerweck] Slaves file is now a template. --- make-distribution.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'make-distribution.sh') diff --git a/make-distribution.sh b/make-distribution.sh index 884659954a..0bc839e1db 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" -- cgit v1.2.3