Update maintainers and code owners project lists

.github/CODEOWNERS

@@ -1,95 +1,95 @@
 bootstrap.sh @frouioui
-go.mod @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui @timvaillancourt
-go.sum @harshit-gangal @mattlord @rohit-nayak-ps @systay @frouioui @timvaillancourt
+go.mod @mattlord @frouioui @timvaillancourt
+go.sum @mattlord @frouioui @timvaillancourt
 /.golangci.yml @timvaillancourt
-/.github/ @mattlord @rohit-nayak-ps @frouioui
+/.github/ @mattlord @frouioui @mhamza15
 /.github/ISSUE_TEMPLATE/ @frouioui @mattlord
-/.github/workflows/ @frouioui @mattlord @rohit-nayak-ps
-/config/mycnf/ @shlomi-noach @mattlord
+/.github/workflows/ @frouioui @mattlord @mhamza15
+/config/mycnf/ @mattlord
 /doc/ @frouioui
-/docker/ @derekperkins @mattlord @frouioui
-/examples/compose @shlomi-noach @frouioui
-/examples/demo @mattlord @rohit-nayak-ps
-/examples/local @rohit-nayak-ps @frouioui @mattlord
+/docker/ @derekperkins @mattlord @frouioui @mhamza15
+/examples/compose @frouioui @mhamza15
+/examples/demo @mattlord
+/examples/local @frouioui @mattlord
 /examples/operator @frouioui @mattlord
 /examples/region_sharding @mattlord
-/java/ @harshit-gangal
+/java/ @mattlord
 /go/cmd @mattlord
-/go/cmd/vtadmin @beingnoble03
+/go/cmd/vtadmin @mattlord @mhamza15
 /go/cmd/vtctldclient @mattlord
-/go/cmd/vtctldclient/command/throttler.go @shlomi-noach @mattlord
-/go/cmd/vtctldclient/command/vreplication @mattlord @rohit-nayak-ps @shlomi-noach @beingnoble03
+/go/cmd/vtctldclient/command/throttler.go @mattlord
+/go/cmd/vtctldclient/command/vreplication @mattlord @beingnoble03
 /go/cmd/vtctldclient/command/backups.go @frouioui @mattlord
 /go/cmd/vtbackup @frouioui
-/go/internal/flag @rohit-nayak-ps
-/go/mysql @harshit-gangal @systay @mattlord
-/go/pools @harshit-gangal
+/go/internal/flag @mattlord
+/go/mysql @mattlord
+/go/pools @arthurschreiber
 /go/protoutil @mattlord @timvaillancourt
-/go/sqltypes @harshit-gangal @shlomi-noach
-/go/test/endtoend/onlineddl @rohit-nayak-ps @shlomi-noach
-/go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
-/go/test/endtoend/schemadiff @shlomi-noach @mattlord
-/go/test/endtoend/transaction @harshit-gangal @systay @frouioui
-/go/test/endtoend/*throttler* @shlomi-noach @mattlord @timvaillancourt
-/go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
-/go/test/endtoend/vtorc @mattlord @shlomi-noach @timvaillancourt
-/go/tools/ @frouioui @systay
-/go/vt/dbconnpool @harshit-gangal @mattlord
+/go/sqltypes @arthurschreiber
+/go/test/endtoend/onlineddl @mattlord
+/go/test/endtoend/messaging @mattlord @derekperkins
+/go/test/endtoend/schemadiff @mattlord
+/go/test/endtoend/transaction @frouioui
+/go/test/endtoend/*throttler* @mattlord @timvaillancourt
+/go/test/endtoend/vtgate @frouioui @arthurschreiber
+/go/test/endtoend/vtorc @mattlord @timvaillancourt
+/go/tools/ @frouioui
+/go/vt/dbconnpool @arthurschreiber @mattlord
 /go/vt/discovery @frouioui @timvaillancourt
-/go/vt/discovery/*tablet_picker* @rohit-nayak-ps @mattlord @timvaillancourt
+/go/vt/discovery/*tablet_picker* @mattlord @timvaillancourt
 /go/vt/mysqlctl @mattlord @frouioui
-/go/vt/proto @harshit-gangal @mattlord
-/go/vt/proto/vtadmin @beingnoble03
-/go/vt/schema @mattlord @shlomi-noach
-/go/vt/servenv @dbussink @timvaillancourt
-/go/vt/schemadiff @shlomi-noach @mattlord
-/go/vt/sqlparser @harshit-gangal @systay
+/go/vt/proto @mattlord
+/go/vt/proto/vtadmin @mattlord
+/go/vt/schema @mattlord
+/go/vt/servenv @timvaillancourt
+/go/vt/schemadiff @mattlord
+/go/vt/sqlparser @arthurschreiber
 /go/vt/srvtopo @mattlord @timvaillancourt
-/go/vt/sysvars @harshit-gangal @systay
+/go/vt/sysvars @mattlord
 /go/vt/topo @mattlord @timvaillancourt
 /go/vt/topotools @mattlord @timvaillancourt
-/go/vt/vitessdriver @harshit-gangal
-/go/vt/vtadmin @beingnoble03 @rohit-nayak-ps
-/go/vt/vtctl @rohit-nayak-ps
-/go/vt/vtctl/vtctl.go @rohit-nayak-ps
+/go/vt/vitessdriver @mattlord @arthurschreiber
+/go/vt/vtadmin @mattlord
+/go/vt/vtctl @mattlord
+/go/vt/vtctl/vtctl.go @mattlord
 /go/vt/vtctl/grpcvtctldclient @mattlord @timvaillancourt
 /go/vt/vtctl/grpcvtctldserver @mattlord @timvaillancourt
 /go/vt/vtctl/reparentutil @timvaillancourt
 /go/vt/vtctl/vtctldclient @mattlord @timvaillancourt
-/go/vt/vtctld @rohit-nayak-ps @mattlord @timvaillancourt
-/go/vt/vterrors @harshit-gangal @systay @frouioui @timvaillancourt
+/go/vt/vtctld @mattlord @timvaillancourt
+/go/vt/vterrors @arthurschreiber @frouioui @timvaillancourt
 /go/vt/vtexplain @systay @harshit-gangal
-/go/vt/vtgate @harshit-gangal @systay @frouioui
-/go/vt/vtgate/endtoend/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vtgate/planbuilder @harshit-gangal @systay @frouioui @arthurschreiber
-/go/vt/vtgate/*vstream* @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vtgate/evalengine @dbussink @systay
-/go/vt/vtorc @mattlord @shlomi-noach @timvaillancourt
-/go/vt/vttablet/*conn* @harshit-gangal @systay
-/go/vt/vttablet/endtoend @harshit-gangal @mattlord @rohit-nayak-ps @systay
-/go/vt/vttablet/grpc* @rohit-nayak-ps @shlomi-noach @harshit-gangal @timvaillancourt
-/go/vt/vttablet/onlineddl @mattlord @rohit-nayak-ps @shlomi-noach
-/go/vt/vttablet/queryservice @harshit-gangal @systay
-/go/vt/vttablet/tabletmanager @rohit-nayak-ps @shlomi-noach @timvaillancourt
-/go/vt/vttablet/tabletmanager/rpc_backup.go @rohit-nayak-ps @shlomi-noach @frouioui
-/go/vt/vttablet/tabletmanager/rpc_throttler.go @shlomi-noach @mattlord @timvaillancourt
-/go/vt/vttablet/tabletserver/throttle @shlomi-noach @mattlord @timvaillancourt
-/go/vt/vttablet/tabletmanager/vreplication @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletmanager/vdiff @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletmanager/vstreamer @rohit-nayak-ps @mattlord @shlomi-noach @beingnoble03
-/go/vt/vttablet/tabletserver* @harshit-gangal @systay @shlomi-noach @rohit-nayak-ps @timvaillancourt
-/go/vt/vttablet/tabletserver/messager @mattlord @rohit-nayak-ps @derekperkins
-/go/vt/vttablet/*tmclient* @rohit-nayak-ps @shlomi-noach @timvaillancourt
-/go/vt/vttablet/vexec @mattlord @rohit-nayak-ps @shlomi-noach
-/go/vt/wrangler @mattlord @rohit-nayak-ps
-/go/vt/vtctl/workflow @mattlord @rohit-nayak-ps @shlomi-noach @beingnoble03
-/proto/ @harshit-gangal
-/proto/vtadmin.proto @beingnoble03 @mattlord
+/go/vt/vtgate @arthurschreiber @frouioui
+/go/vt/vtgate/endtoend/*vstream* @mattlord
+/go/vt/vtgate/planbuilder @frouioui @arthurschreiber
+/go/vt/vtgate/*vstream* @mattlord
+/go/vt/vtgate/evalengine @arthurschreiber
+/go/vt/vtorc @mattlord @timvaillancourt @mhamza15
+/go/vt/vttablet/*conn* @arthurschreiber
+/go/vt/vttablet/endtoend @mattlord @arthurschreiber
+/go/vt/vttablet/grpc* @mattlord @timvaillancourt
+/go/vt/vttablet/onlineddl @mattlord
+/go/vt/vttablet/queryservice @arthurschreiber
+/go/vt/vttablet/tabletmanager @mattlord @timvaillancourt
+/go/vt/vttablet/tabletmanager/rpc_backup.go @mattlord @frouioui
+/go/vt/vttablet/tabletmanager/rpc_throttler.go @mattlord @timvaillancourt
+/go/vt/vttablet/tabletserver/throttle @mattlord @timvaillancourt
+/go/vt/vttablet/tabletmanager/vreplication @mattlord
+/go/vt/vttablet/tabletmanager/vdiff @mattlord
+/go/vt/vttablet/tabletmanager/vstreamer @mattlord
+/go/vt/vttablet/tabletserver* @mattlord @arthurschreiber @timvaillancourt
+/go/vt/vttablet/tabletserver/messager @mattlord @derekperkins
+/go/vt/vttablet/*tmclient* @mattlord @timvaillancourt
+/go/vt/vttablet/vexec @mattlord
+/go/vt/wrangler @mattlord
+/go/vt/vtctl/workflow @mattlord
+/proto/ @mattlord
+/proto/vtadmin.proto @mattlord
 /proto/vtctldata.proto @mattlord
 /proto/vtctlservice.proto @mattlord
-/proto/vtgateservice.proto @vitessio/vtgateservice
-/proto/vtorcdata.proto @mattlord @shlomi-noach @timvaillancourt
-/test/ @frouioui @rohit-nayak-ps @mattlord @harshit-gangal
-/tools/ @frouioui @rohit-nayak-ps
-/web/vtadmin @beingnoble03
-/web/vtadmin/src/proto @harshit-gangal @mattlord @beingnoble03
+/proto/vtgateservice.proto @arthurschreiber
+/proto/vtorcdata.proto @mattlord @timvaillancourt
+/test/ @frouioui @mattlord
+/tools/ @frouioui
+/web/vtadmin @mattlord
+/web/vtadmin/src/proto @mattlord

MAINTAINERS.md

@@ -2,18 +2,11 @@ This page lists all active maintainers and their areas of expertise. This can be
 
 The following is the full list, alphabetically ordered.
 
-* Andres Taylor ([systay](https://github.com/systay)) andres@planetscale.com
 * Arthur Schreiber ([arthurschreiber](https://github.com/arthurschreiber)) schreiber.arthur@gmail.com
 * Derek Perkins ([derekperkins](https://github.com/derekperkins)) derek@nozzle.io
-* Dirkjan Bussink ([dbussink](https://github.com/dbussink)) dbussink@planetscale.com
 * Florent Poinsard ([frouioui](https://github.com/frouioui)) florent@planetscale.com
-* Harshit Gangal ([harshit-gangal](https://github.com/harshit-gangal)) harshit.gangal@gmail.com
 * Matt Lord ([mattlord](https://github.com/mattlord)) mattalord@gmail.com
 * Mohamed Hamza ([mhamza15](https://github.com/mhamza15)) mhamza@fastmail.com
-* Nick Van Wiggeren ([nickvanw](https://github.com/nickvanw)) nick@planetscale.com
-* Noble Mittal ([beingnoble03](https://github.com/beingnoble03)) noble@planetscale.com
-* Rohit Nayak ([rohit-nayak-ps](https://github.com/rohit-nayak-ps)) rohit@planetscale.com
-* Shlomi Noach ([shlomi-noach](https://github.com/shlomi-noach)) shlomi@planetscale.com
 * Tim Vaillancourt ([timvaillancourt](https://github.com/timvaillancourt)) tim@timvaillancourt.com
 
 ## Areas of expertise
@@ -52,7 +45,7 @@ harshit-gangal
 derekperkins, frouioui
 
 ### VTAdmin
-beingnoble03, rohit-nayak-ps
+mattlord
 
 ### Messaging
 derekperkins, mattlord
@@ -61,19 +54,22 @@ derekperkins, mattlord
 mattlord, timvaillancourt
 
 ### Security
-timvaillancourt
+timvaillancourt, mattlord
 
 ## Past Maintainers
 We thank the following past maintainers for their contributions.
 
 * Alain Jobart ([alainjobart](https://github.com/alainjobart))
 * Alkin Tezuysal ([askdba](https://github.com/askdba))
 * Andrew Mason ([ajm188](https://github.com/ajm188))
+* Andres Taylor ([systay](https://github.com/systay)) andres@planetscale.com
 * Anthony Yeh ([enisoc](https://github.com/enisoc))
 * Dan Kozlowski ([dkhenry](https://github.com/dkhenry))
 * David Weitzman ([dweitzman](https://github.com/dweitzman))
 * Deepthi Sigireddi ([deepthi](https://github.com/deepthi))
+* Dirkjan Bussink ([dbussink](https://github.com/dbussink)) dbussink@planetscale.com
 * Frances Thai ([notfelineit](https://github.com/notfelineit))
+* Harshit Gangal ([harshit-gangal](https://github.com/harshit-gangal)) harshit.gangal@gmail.com
 * Jon Tirsen ([tirsen](https://github.com/tirsen))
 * Leo X. Lin ([leoxlin](https://github.com/leoxlin))
 * Mali Akmanalp ([makmanalp](https://github.com/makmanalp)
@@ -82,8 +78,12 @@ We thank the following past maintainers for their contributions.
 * Michael Demmer ([demmer](https://github.com/demmer))
 * Michael Pawliszyn ([mpawliszyn](https://github.com/mpawliszyn))
 * Morgan Tocker ([morgo](https://github.com/morgo))
+* Nick Van Wiggeren ([nickvanw](https://github.com/nickvanw)) nick@planetscale.com
+* Noble Mittal ([beingnoble03](https://github.com/beingnoble03)) noble@planetscale.com
 * Paul Hemberger ([pH14](https://github.com/pH14))
 * Rafael Chacon ([rafael](https://github.com/rafael))
+* Rohit Nayak ([rohit-nayak-ps](https://github.com/rohit-nayak-ps)) rohit@planetscale.com
 * Sara Bee ([doeg](https://github.com/doeg))
+* Shlomi Noach ([shlomi-noach](https://github.com/shlomi-noach)) shlomi@planetscale.com
 * Sugu Sougoumarane ([sougou](https://github.com/sougou))
 * Vicent Marti ([vmg](https://github.com/vmg))