From c7a35817352914547491fcee3ca7c86a2442efa5 Mon Sep 17 00:00:00 2001
From: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Date: Mon, 16 Mar 2026 12:39:36 +0000
Subject: [PATCH 1/2] chore: update maintainers and add CODEOWNERS
 Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

---
 CODEOWNERS     | 4 ++++
 MAINTAINERS.md | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..1f70593ce
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,4 @@
+# https://help.github.com/articles/about-codeowners/
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+* @fstab @dhoard @zeitlinger @jaydeluca
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index cf0a885eb..cc398893d 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -2,5 +2,9 @@
 
 - Fabian Stäber <fabian@fstab.de> @fstab
 - Doug Hoard <doug.hoard@gmail.com> @dhoard
-- Tom Wilkie <tom@grafana.com> @tomwilkie
 - Gregor Zeitlinger <gregor.zeitlinger@grafana.com> @zeitlinger
+- Jay DeLuca <jaydeluca4@gmail.com> @jaydeluca
+
+# Emeritus
+
+- Tom Wilkie <tom@grafana.com> @tomwilkie

From 445031277aedba201891868ea4d2a6c0c9dfdf53 Mon Sep 17 00:00:00 2001
From: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
Date: Mon, 16 Mar 2026 12:47:56 +0000
Subject: [PATCH 2/2] fix: use h2 for Emeritus heading to satisfy markdownlint
 MD025 Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>

---
 MAINTAINERS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index cc398893d..a247eb14a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,6 +5,6 @@
 - Gregor Zeitlinger <gregor.zeitlinger@grafana.com> @zeitlinger
 - Jay DeLuca <jaydeluca4@gmail.com> @jaydeluca
 
-# Emeritus
+## Emeritus
 
 - Tom Wilkie <tom@grafana.com> @tomwilkie