[trafficserver] branch master updated: Enable merging for 10-Dev merge (#9353)

[bc...@apache.org]

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

bcall 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 06020a1cf Enable merging for 10-Dev merge (#9353)
06020a1cf is described below

commit 06020a1cf1a769785d70a1dff313f72b03cc4e84
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Feb 1 11:03:40 2023 -0800

    Enable merging for 10-Dev merge (#9353)
---
 .asf.yaml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 9018f895a..478551c41 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -11,6 +11,11 @@ github:
     - cdn
     - cache
     - apache
+    - http/2
+    - http/3
+    - quic
+    - forwardproxy
+    - reverseproxy
     - hacktoberfest
   features:
     # Enable wiki for documentation
@@ -24,14 +29,11 @@ github:
     squash: true
     # Disable rebase button:
     rebase: false
-    # Disable merge button:
-    merge: false
+    # Enable merge button:
+    merge: true
   collaborators:
     - mtorluemke
     - c-taylor
-    - moonchen
-    - cmcfarlen
-    - serrislew
     - etapia
   protected_branches:
     master: