[rocketmq] branch odbozhou-patch-1 created (now 4611b6baa)

[zh...@apache.org]

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

zhoubo pushed a change to branch odbozhou-patch-1
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


      at 4611b6baa 5.0.0 release temporarily open merge, keep release commitId

This branch includes the following new commits:

     new 4611b6baa 5.0.0 release temporarily open merge, keep release commitId

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[rocketmq] 01/01: 5.0.0 release temporarily open merge, keep release commitId

[zh...@apache.org]

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

zhoubo pushed a commit to branch odbozhou-patch-1
in repository https://gitbox.apache.org/repos/asf/rocketmq.git

commit 4611b6baa6ff741c71b057fb9d023ee573433b3a
Author: zhoubo <87...@qq.com>
AuthorDate: Fri Sep 23 15:33:55 2022 +0800

    5.0.0 release temporarily open merge, keep release commitId
---
 .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index f98da50a7..d549e6f0f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -27,7 +27,7 @@ github:
     # Enable squash button
     squash: true
     # Disable merge button
-    merge: false
+    merge: true
     # Enable rebase button
     rebase: true
   protected_branches:
@@ -41,4 +41,4 @@ github:
         contexts:
           - misspell-check
           - check-license
-          - maven-compile (ubuntu-18.04, JDK-8)
\ No newline at end of file
+          - maven-compile (ubuntu-18.04, JDK-8)