[incubator-pegasus] branch master updated: fix: asf file is invalid for the name is not right (#939)

[zh...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 6e84d57  fix: asf file is invalid for the name is not right  (#939)
6e84d57 is described below

commit 6e84d57970622fd628e25607dfdd9d92ddab487b
Author: Jiashuo <js...@live.com>
AuthorDate: Thu Mar 31 16:57:00 2022 +0800

    fix: asf file is invalid for the name is not right  (#939)
---
 .asf.yml => .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yml b/.asf.yaml
similarity index 96%
rename from .asf.yml
rename to .asf.yaml
index ef3b86d..165b104 100644
--- a/.asf.yml
+++ b/.asf.yaml
@@ -35,8 +35,8 @@ github:
   enabled_merge_buttons:
     # enable squash button:
     squash:  true
-    # disable merge button:
-    merge:   false
+    # enable merge button:
+    merge:   true
     # enable rebase button:
     rebase:  true
 

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