From 599b06c0d0e29ff8f1244f6aad9ebafa8ed02c78 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 11 Sep 2025 08:49:08 -0500 Subject: [PATCH 1/2] add ingest-docs team as CODEOWNERS for release notes and docset.yml (#9865) (cherry picked from commit c8f5f631f820a2bb411fc7b8209d3329da63f5e3) # Conflicts: # .github/CODEOWNERS --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c938f3ca8dc..f5514f78136 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,5 +13,10 @@ /deploy/helm/edot-collector @elastic/ingest-otel-data /deploy/kubernetes @elastic/elastic-agent-control-plane /dev-tools/kubernetes @elastic/elastic-agent-control-plane +<<<<<<< HEAD /internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat +======= +/docs/release-notes @elastic/ingest-docs +/docs/docset.yml @elastic/ingest-docs +>>>>>>> c8f5f631f (add ingest-docs team as CODEOWNERS for release notes and docset.yml (#9865)) /internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane From 39a2e4ffc2e12ed171d50019732371bf9b7504f5 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 17 Sep 2025 14:34:02 +0200 Subject: [PATCH 2/2] Update CODEOWNERS --- .github/CODEOWNERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f5514f78136..09265c2caac 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,10 +13,7 @@ /deploy/helm/edot-collector @elastic/ingest-otel-data /deploy/kubernetes @elastic/elastic-agent-control-plane /dev-tools/kubernetes @elastic/elastic-agent-control-plane -<<<<<<< HEAD -/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat -======= /docs/release-notes @elastic/ingest-docs /docs/docset.yml @elastic/ingest-docs ->>>>>>> c8f5f631f (add ingest-docs team as CODEOWNERS for release notes and docset.yml (#9865)) +/internal/pkg/agent/application/configuration_embed_changed_test.go @elastic/cloudbeat /internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane