merge #4519 opencontainers/runc:main

cyphar · cyphar · commit 8ed185031a2c · 2024-11-11T22:55:57.000+11:00
Kir Kolyshkin (1):
  MAINTAINERS: move dqminh and hqhq to EMERITUS

LGTMs: dqminh hqhq cyphar kolyshkin thaJeztah lifubang
diff --git a/EMERITUS.md b/EMERITUS.md
@@ -8,5 +8,7 @@ contributions to our collective success:
  * Rohit Jnagal (@rjnagal)
  * Victor Marmol (@vmarmol)
  * Michael Crosby (@crosbymichael)
+ * Daniel, Dao Quang Minh (@dqminh)
+ * Qiang Huang (@hqhq)
 
 We thank these members for their service to the OCI community.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -1,6 +1,4 @@
 Mrunal Patel <mpatel@redhat.com> (@mrunalp)
-Daniel, Dao Quang Minh <dqminh89@gmail.com> (@dqminh)
-Qiang Huang <h.huangqiang@huawei.com> (@hqhq)
 Aleksa Sarai <cyphar@cyphar.com> (@cyphar)
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (@AkihiroSuda)
 Kir Kolyshkin <kolyshkin@gmail.com> (@kolyshkin)

-Original file line number
+Diff line change
@@ @@ -1,6 +1,4 @@ @@
 Mrunal Patel <[email protected]> (@mrunalp)
 -Daniel, Dao Quang Minh <[email protected]> (@dqminh)
 -Qiang Huang <[email protected]> (@hqhq)
 Aleksa Sarai <[email protected]> (@cyphar)
 Akihiro Suda <[email protected]> (@AkihiroSuda)
 Kir Kolyshkin <[email protected]> (@kolyshkin)