[phoenix-connectors] 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-connectors.git


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

commit f792d33bd5dc47a8795565cdf35c2529444a84b1
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue Aug 16 09:10:03 2022 +0200

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

diff --git a/.asf.yaml b/.asf.yaml
index eeed404..26eaad3 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file controls the integration of the Phoenix Connectors subproject 
+# This file controls the integration of the Phoenix Connectors repo
 # with ASF infrastructure. Refer to
 # https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features
 # for details. Be careful when changing the contents of this file since it
@@ -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