Skip to content

Commit

Permalink
Slaves file is now a template.
Browse files Browse the repository at this point in the history
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 <[email protected]>

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

d11d99a [Sarah Gerweck] Slaves file is now a template.
  • Loading branch information
sarahgerweck authored and rxin committed Sep 27, 2014
1 parent a3feaf0 commit e976ca2
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion make-distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit e976ca2

Please sign in to comment.