You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by bn...@apache.org on 2026/03/18 19:06:30 UTC

(trafficserver) branch master updated: Disable merge commit button after temporary release window (#12993)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 25ef95f22a Disable merge commit button after temporary release window (#12993)
25ef95f22a is described below

commit 25ef95f22a1210e6f843a9dcdced8ad11baf0d34
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Mar 18 12:06:23 2026 -0700

    Disable merge commit button after temporary release window (#12993)
    
    Revert the temporary merge-button enablement used for the 11-dev history-preserving merge, and clarify that this setting controls the merge commit button specifically.
---
 .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index b79e9fc462..eb33ef24fe 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -29,8 +29,8 @@ github:
     squash: true
     # Disable rebase button:
     rebase: false
-    # Enable merge button:
-    merge: true
+    # Disable merge commit button:
+    merge: false
   collaborators:
     - mtorluemke
     - c-taylor