From 6082e5a68cda7053f0ffd9a77c57631d1790f44f Mon Sep 17 00:00:00 2001
From: Kishore Rajasekar <86338791+ki1729@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:24:43 -0700
Subject: [PATCH 1/2] Updating code owners +ki1729 -hemanttanwar

---
 .github/CODEOWNERS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b9a00212b35d..e40bff8046bc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,11 +6,11 @@
 ###########
 
 # Catch all
-/sdk/                                               @joshfree @srnagar @hemanttanwar @anuchandy @conniey @jianghaolu
+/sdk/                                               @joshfree @srnagar @anuchandy @conniey @jianghaolu
 
 # BOM
 # PRLabel: %bom
-/sdk/boms/azure-sdk-bom/                            @alzimmermsft @jonathangiles @srnagar @hemanttanwar @anuchandy @pallavit
+/sdk/boms/azure-sdk-bom/                            @alzimmermsft @jonathangiles @srnagar @anuchandy @pallavit
 # PRLabel: %azure-spring
 /sdk/boms/azure-spring-boot-bom/                    @saragluna @yiliuTo @chenrujun @backwind1233 @stliu
 
@@ -33,7 +33,7 @@
 /sdk/containerregistry/                             @pallavit @alzimmermsft @jianghaolu
 
 # PRLabel: %Azure.Core
-/sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @hemanttanwar @anuchandy @lmolkova
+/sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @anuchandy @lmolkova
 
 # PRLabel: %Azure.Core
 /sdk/core/azure-core-tracing-opentelemetry/         @samvaity @alzimmermsft @trask @lmolkova
@@ -89,10 +89,10 @@
 /sdk/schemaregistry/                                @arerlend @sjkwak
 
 # PRLabel: %Search
-/sdk/search/                                        @alzimmermsft @hemanttanwar @mssfang @samvaity @conniey
+/sdk/search/                                        @alzimmermsft @mssfang @samvaity @conniey
 
 # PRLabel: %Service Bus
-/sdk/servicebus/                                    @yvgopal @nemakam @hemanttanwar @conniey @yijunxiems
+/sdk/servicebus/                                    @yvgopal @nemakam @ki1729 @conniey @yijunxiems
 
 # PRLabel: %Storage
 /sdk/storage/                                       @amishra-dev @rickle-msft @jaschrep-msft @gapra-msft @alzimmermsft @kasobol-msft

From f6e39072ec05bb773732713a646de21597785299 Mon Sep 17 00:00:00 2001
From: Kishore Rajasekar <86338791+ki1729@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:52:36 -0700
Subject: [PATCH 2/2] Adding Azure core AMQP owners

---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e40bff8046bc..bc0fb9a9dbf7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,6 +35,9 @@
 # PRLabel: %Azure.Core
 /sdk/core/                                          @alzimmermsft @jianghaolu @srnagar @anuchandy @lmolkova
 
+# PRLabel: %Azure.Core.AMQP
+/sdk/core/azure-core-amqp/                          @conniey @yijunxiems @ki1729 @srnagar @anuchandy
+
 # PRLabel: %Azure.Core
 /sdk/core/azure-core-tracing-opentelemetry/         @samvaity @alzimmermsft @trask @lmolkova