[calcite-avatica] 02/02: [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

[fr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

francischuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite-avatica.git

commit f954a0aebd18b55fa6b62b5b254de362a0b5ff69
Author: Francis Chuang <fr...@apache.org>
AuthorDate: Sun May 12 21:36:38 2019 +1000

    [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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker.sh b/docker.sh
index e1644cb..fa1f97e 100755
--- a/docker.sh
+++ b/docker.sh
@@ -407,7 +407,7 @@ Here is my vote:
 
 +1 (binding)
 
-$NAME
+$FIRST_NAME
 "
 }
 
@@ -440,7 +440,7 @@ promote_release(){
     [[ $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