commit f954a0aebd18b55fa6b62b5b254de362a0b5ff69
author Francis Chuang <francischuang@apache.org> Sun May 12 21:36:38 2019 +1000
committer Francis Chuang <francischuang@apache.org> Sun May 12 21:36:38 2019 +1000
tree 7e5b9f98e717321f38329430f2323f7a91566db9
parent a0167034d92cf1f9d1cbcf05b6a60f8485f54a01

[CALCITE-3059] Fix release script to use correct release branch name when merging to master and to use the correct variable when generating the vote email

docker.sh

diff --git a/docker.sh b/docker.sh
index e1644cb..fa1f97e 100755
--- a/docker.sh
+++ b/docker.sh
@@ -407,7 +407,7 @@
 
 +1 (binding)
 
-$NAME
+$FIRST_NAME
 "
 }
 
@@ -440,7 +440,7 @@
     [[ $TAG_WITHOUT_RC =~ ([[:digit:]]+\.[[:digit:]]+)\.[[:digit:]]+$ ]]
     BRANCH_VERSION=${BASH_REMATCH[1]}
     git checkout master
-    git merge branch-$TAG_WITHOUT_RC --ff-only
+    git merge branch-avatica-$BRANCH_VERSION --ff-only
     git push $GITBOX_URL master
 
     svn checkout $RELEASE_REPO /tmp/release