[phoenix] branch master updated: PHOENIX-6771 Allow only "squash and merge" from GitHub UI

[st...@apache.org]

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

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 2497b173bf PHOENIX-6771 Allow only "squash and merge" from GitHub UI
2497b173bf is described below

commit 2497b173bf1aa8cee39cacba07fbbf006110f298
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Aug 16 09:06:50 2022 +0200

    PHOENIX-6771 Allow only "squash and merge" from GitHub UI
---
 .asf.yaml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 22e3eab02d..2a9f642fa7 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,7 +22,13 @@
 # changes with dev@ before committing.
 
 notifications:
-    commits:      commits@phoenix.apache.org
-    issues:       issues@phoenix.apache.org
-    pullrequests: issues@phoenix.apache.org
-    jira_options: link label comment
+  commits: commits@phoenix.apache.org
+  issues: issues@phoenix.apache.org
+  pullrequests: issues@phoenix.apache.org
+  jira_options: link label comment
+
+github:
+  enabled_merge_buttons:
+    squash: true
+    merge: false
+    rebase: false