From 100f5afdbf1faf19288f75d5ab8ede099322b327 Mon Sep 17 00:00:00 2001
From: deannagarcia <69992229+deannagarcia@users.noreply.github.com>
Date: Mon, 31 Oct 2022 13:45:15 -0700
Subject: [PATCH 1/3] Create CODEOWNERS

Create a CODEOWNERS file that matches subteams to code paths.
---
 .github/CODEOWNERS | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..1f405ce0c0
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,36 @@
+/src/ @protocolbuffers/protobuf-compiler
+
+/src/google/protobuf/compiler/cpp @protocolbuffers/protobuf-cpp
+
+/csharp/ @protocolbuffers/protobuf-csharp
+/src/google/protobuf/compiler/csharp/ @protocolbuffers/protobuf-csharp
+
+/docs/ @protocolbuffers/protobuf-docs
+/examples/ @protocolbuffers/protobuf-docs
+
+/java/ @protocolbuffers/protobuf-java
+/src/google/protobuf/compiler/java/ @protocolbuffers/protobuf-java
+
+/java/kotlin-lite/ @protocolbuffers/protobuf-kotlin
+/java/kotlin/ @protocolbuffers/protobuf-kotlin
+
+/objectivec/ @protocolbuffers/protobuf-objc/
+/src/google/protobuf/compiler/objectivec/ @protocolbuffers/protobuf-objc
+
+/php/ @protocolbuffers/protobuf-php
+/src/google/protobuf/compiler/php/ @protocolbuffers/protobuf-php
+
+/python/ @protocolbuffers/protobuf-python
+/src/google/protobuf/compiler/python/
+
+/ruby/ @protocolbuffers/protobuf-ruby
+/src/google/protobuf/compiler/ruby/ @protocolbuffers/protobuf-ruby
+
+/build_defs/ @protocolbuffers/protobuf-btr
+/cmake/ @protocolbuffers/protobuf-btr
+/pkg/ @protocolbuffers/protobuf-btr
+/toolchain/ @protocolbuffers/protobuf-btr
+/conformance/ @protocolbuffers/protobuf-btr
+/kokoro/ @protocolbuffers/protobuf-btr
+/third_party/ @protocolbuffers/protobuf-btr
+*.bazel @protocolbuffers/protobuf-btr

From 825689d6fc5e06688c603a8109a4bf51869e2f1d Mon Sep 17 00:00:00 2001
From: deannagarcia <69992229+deannagarcia@users.noreply.github.com>
Date: Mon, 31 Oct 2022 13:46:25 -0700
Subject: [PATCH 2/3] Update CODEOWNERS

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1f405ce0c0..58e7a9b35e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,7 +14,7 @@
 /java/kotlin-lite/ @protocolbuffers/protobuf-kotlin
 /java/kotlin/ @protocolbuffers/protobuf-kotlin
 
-/objectivec/ @protocolbuffers/protobuf-objc/
+/objectivec/ @protocolbuffers/protobuf-objc
 /src/google/protobuf/compiler/objectivec/ @protocolbuffers/protobuf-objc
 
 /php/ @protocolbuffers/protobuf-php

From e1b264ef9beb2a25b81a4320c4d5ffe9e9f4dffa Mon Sep 17 00:00:00 2001
From: deannagarcia <69992229+deannagarcia@users.noreply.github.com>
Date: Wed, 9 Nov 2022 14:14:03 -0800
Subject: [PATCH 3/3] Fix CODEOWNERS

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 58e7a9b35e..03c04125ba 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -21,7 +21,7 @@
 /src/google/protobuf/compiler/php/ @protocolbuffers/protobuf-php
 
 /python/ @protocolbuffers/protobuf-python
-/src/google/protobuf/compiler/python/
+/src/google/protobuf/compiler/python/ @protocolbuffers/protobuf-python
 
 /ruby/ @protocolbuffers/protobuf-ruby
 /src/google/protobuf/compiler/ruby/ @protocolbuffers/protobuf-ruby