From 3a76fdb588857214e6c76d46825882d5d9bcd2c7 Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Wed, 11 Mar 2020 16:27:00 -0700
Subject: [PATCH 1/4] Add nak3 to networking approvers.

From ROLES.md

1/ Reviewer of the codebase for at least 3 months.

https://github.com/knative/serving/pull/4245 is 9 months old.

2/ Primary reviewer for at least 10 substantial PRs to the codebase.

[4
XLs](https://github.com/knative/serving/pulls?q=is%3Apr++is%3Aclosed+reviewed-by%3Anak3+label%3Asize%2FXL+)
[13
Ls](https://github.com/knative/serving/pulls?q=is%3Apr++is%3Aclosed+reviewed-by%3Anak3+label%3Asize%2FL)

3/ [56 Reviewed
PRs](https://github.com/knative/serving/pulls?q=is%3Apr++is%3Aclosed+reviewed-by%3Anak3+)

4/ [116 Merged PRs](
https://github.com/knative/serving/pulls?q=is%3Apr+is%3Aclosed+author%3Anak3)

4/ Nominated by nghia@ with no objections from other leads
---
 OWNERS_ALIASES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index f24829277a54..826eed7e3ddd 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -58,6 +58,7 @@ aliases:
   - mdemirhan
   - tcnghia
   - vagababov
+  - nak3
   networking-reviewers:
   - JRBANCEL
   - ZhiminXiang

From 75c83649bdcb6fb55f5f8254007fdc329b6e2f72 Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Wed, 11 Mar 2020 18:00:06 -0700
Subject: [PATCH 2/4] Sort the lines.

---
 OWNERS_ALIASES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 826eed7e3ddd..73b335a53faf 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -56,15 +56,15 @@ aliases:
   networking-approvers:
   - markusthoemmes
   - mdemirhan
+  - nak3
   - tcnghia
   - vagababov
-  - nak3
   networking-reviewers:
   - JRBANCEL
-  - ZhiminXiang
   - markusthoemmes
   - mdemirhan
   - nak3
   - tcnghia
   - vagababov
   - yanweiguo
+  - ZhiminXiang

From 719ed1a962f3958c78a6d8d6bb25b388ad994e8c Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Thu, 12 Mar 2020 11:34:33 -0700
Subject: [PATCH 3/4] Sort lines alphabetically

---
 OWNERS_ALIASES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 73b335a53faf..52655b601147 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -60,7 +60,10 @@ aliases:
   - tcnghia
   - vagababov
   networking-reviewers:
+<<<<<<< HEAD
   - JRBANCEL
+=======
+>>>>>>> Sort lines alphabetically
   - markusthoemmes
   - mdemirhan
   - nak3

From 79a94c6d167f6cbe335d7c5c44a4aa46258e8528 Mon Sep 17 00:00:00 2001
From: Nghia Tran <nghia@google.com>
Date: Fri, 13 Mar 2020 10:36:03 -0700
Subject: [PATCH 4/4] Remove merge conflict markers.

---
 OWNERS_ALIASES | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 52655b601147..73b335a53faf 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -60,10 +60,7 @@ aliases:
   - tcnghia
   - vagababov
   networking-reviewers:
-<<<<<<< HEAD
   - JRBANCEL
-=======
->>>>>>> Sort lines alphabetically
   - markusthoemmes
   - mdemirhan
   - nak3