[incubator-teaclave] branch master updated: Fix release guide (#645)

[ms...@apache.org]

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

mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f2943eb Fix release guide (#645)
3f2943eb is described below

commit 3f2943eb7e3507e4492db980a856c79989563552
Author: Mingshen Sun <ms...@apache.org>
AuthorDate: Mon Apr 18 17:38:15 2022 -0700

    Fix release guide (#645)
---
 docs/release-guide.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/release-guide.md b/docs/release-guide.md
index cdcda28b..57f69f86 100644
--- a/docs/release-guide.md
+++ b/docs/release-guide.md
@@ -227,6 +227,7 @@ svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m "Add 1.0.0"
 
 To upload the binaries to Apache mirrors, you copy the binaries from the dev
 directory (this should be where they are voted) to the dist directory.
+These artifacts will be automatically propagated to the CDN service.
 
 ```
 export SVN_EDITOR=vim
@@ -243,8 +244,10 @@ Merge commits in the release branch to the main branch, create a new release tag
 
 ```
 git checkout master
+## merge the release branch and use --ff-only to ensure the commit hash for voting is also in the master branch
 git merge release-v1.0.0 --ff-only
 git tag v1.0.0
+git push origin v1.0.0
 git push --delete origin v1.0.0-rc.1
 git push --delete origin release-v1.0.0
 ```


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org