aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdev/create-release/create-release.sh4
-rwxr-xr-xmake-distribution.sh1
2 files changed, 2 insertions, 3 deletions
diff --git a/dev/create-release/create-release.sh b/dev/create-release/create-release.sh
index ad38c8d53e..f1aa0f8f99 100755
--- a/dev/create-release/create-release.sh
+++ b/dev/create-release/create-release.sh
@@ -92,7 +92,6 @@ make_binary_release() {
cp spark-$RELEASE_VERSION-bin-$NAME/spark-$RELEASE_VERSION-bin-$NAME.tgz .
rm -rf spark-$RELEASE_VERSION-bin-$NAME
- tar cvzf spark-$RELEASE_VERSION-bin-$NAME.tgz spark-$RELEASE_VERSION-bin-$NAME
echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --armour \
--output spark-$RELEASE_VERSION-bin-$NAME.tgz.asc \
--detach-sig spark-$RELEASE_VERSION-bin-$NAME.tgz
@@ -102,7 +101,6 @@ make_binary_release() {
echo $GPG_PASSPHRASE | gpg --passphrase-fd 0 --print-md \
SHA512 spark-$RELEASE_VERSION-bin-$NAME.tgz > \
spark-$RELEASE_VERSION-bin-$NAME.tgz.sha
- rm -rf spark-$RELEASE_VERSION-bin-$NAME
}
make_binary_release "hadoop1" "--hadoop 1.0.4"
@@ -114,7 +112,7 @@ echo "Copying release tarballs"
ssh $USER_NAME@people.apache.org \
mkdir /home/$USER_NAME/public_html/spark-$RELEASE_VERSION-$RC_NAME
rc_folder=spark-$RELEASE_VERSION-$RC_NAME
-scp spark* \
+scp spark-* \
$USER_NAME@people.apache.org:/home/$USER_NAME/public_html/$rc_folder/
# Docs
diff --git a/make-distribution.sh b/make-distribution.sh
index 83dfc74585..62a2821774 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -141,6 +141,7 @@ cp $FWDIR/examples/target/scala*/spark-examples*.jar "$DISTDIR/lib/"
# Copy other things
mkdir "$DISTDIR"/conf
cp "$FWDIR"/conf/*.template "$DISTDIR"/conf
+cp "$FWDIR"/conf/slaves "$DISTDIR"/conf
cp -r "$FWDIR/bin" "$DISTDIR"
cp -r "$FWDIR/python" "$DISTDIR"
cp -r "$FWDIR/sbin" "$DISTDIR"