From d11dc86c88baf3ba44e899ad30cf52b14e525d3a Mon Sep 17 00:00:00 2001 From: The Apache Software Foundation Date: Fri, 15 May 2026 17:35:59 -0500 Subject: [PATCH 1/2] Set up default protection ruleset for default and release branches --- .asf.yaml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index f836571..6224d42 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -26,12 +26,25 @@ github: autolink_jira: - HDDS enabled_merge_buttons: - squash: true + squash: true squash_commit_message: PR_TITLE - merge: false - rebase: false + merge: false + rebase: false + rulesets: + - name: "Default Branch Protection" + type: branch + branches: + includes: + - "~DEFAULT_BRANCH" + - "release/*" + - "rel/*" + excludes: [] + bypass_teams: + - root + restrict_deletion: true + restrict_force_push: true notifications: - commits: commits@ozone.apache.org - issues: issues@ozone.apache.org + commits: commits@ozone.apache.org + issues: issues@ozone.apache.org pullrequests: issues@ozone.apache.org jira_options: link label worklog From d5f29a75a7abe5051fa56c8b5c19172cd35cd5a5 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com> Date: Thu, 21 May 2026 19:15:59 +0200 Subject: [PATCH 2/2] Update release branch names, add flavor branches --- .asf.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 6224d42..42cb8e8 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -36,8 +36,9 @@ github: branches: includes: - "~DEFAULT_BRANCH" - - "release/*" - - "rel/*" + - "all-in-one" + - "ozone-*" + - "slim" excludes: [] bypass_teams: - root