Merge branch 'main' into poc-grpc-clientconn

open-telemetry · Nov 19, 2021 · 582bf20 · 582bf20
2 parents f1e0509 + b42ab7d
commit 582bf20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -14,4 +14,4 @@
 
 * @jmacd @MrAlias @Aneurysm9 @evantorrie @XSAM @dashpole @paivagustavo @MadVikingGod @pellared
 
-CODEOWNERS @MrAlias @Aneurysm9
+CODEOWNERS @MrAlias @Aneurysm9 @MadVikingGod
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -481,11 +481,11 @@ Approvers:
 - [Sam Xie](https://github.com/XSAM)
 - [David Ashpole](https://github.com/dashpole), Google
 - [Gustavo Silva Paiva](https://github.com/paivagustavo), LightStep
-- [Aaron Clawson](https://github.com/MadVikingGod)
 - [Robert Pająk](https://github.com/pellared), Splunk
 
 Maintainers:
 
+- [Aaron Clawson](https://github.com/MadVikingGod), LightStep
 - [Anthony Mirabella](https://github.com/Aneurysm9), AWS
 - [Tyler Yahn](https://github.com/MrAlias), Splunk