X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=MAINTAINERS;h=06696db8d4404e4a7f99c27fa43048d9779985e4;hb=dd1e3e780;hp=81b34f896c0bdfa8d98e103b7636afb9e37fed66;hpb=ba7992aa62523d014b55802463fb3357c7099b70;p=vpp.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 81b34f896c0..06696db8d44 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -28,6 +28,11 @@ Doxygen
 M:	Chris Luke <chrisy@flirble.org>
 F:	doxygen/
 
+Sphinx Documents
+M:     John DeNisco <jdenisco@cisco.com>
+M:     Ray Kinsella <raykinsella78@gmail.com>
+F:     docs/
+
 DPDK Development Packaging
 M:	Damjan Marion <damarion@cisco.com>
 F:	dpdk/
@@ -46,7 +51,6 @@ VLIB API Libraries
 M:	Dave Barach <dave@barachs.net>
 F:	src/vlibapi/
 F:	src/vlibmemory/
-F:	src/vlibsocket/
 
 VNET Bidirectonal Forwarding Detection (BFD)
 M:	Klement Sekera <ksekera@cisco.com>
@@ -101,9 +105,9 @@ M:	Florin Coras <fcoras@cisco.com>
 F:	src/vnet/lisp-cp/
 F:	src/vnet/lisp-gpe/
 
-VNET MAP
+Plugin - MAP
 M:	Ole Troan <ot@cisco.com>
-F:	src/vnet/map
+F:	src/plugins/map
 
 VNET MPLS
 M:	Neale Ranns <nranns@cisco.com>
@@ -126,9 +130,16 @@ M:	Keith Burns <alagalah@gmail.com>
 M:	Hongjun Ni <hongjun.ni@intel.com>
 F:	src/vnet/vxlan-gpe/
 
-VNET GENEVE
-M:	Marco Varlese <marco.varlese@suse.com>
-F:	src/vnet/geneve/
+VNET IPIP
+M:	Ole Troan <otroan@employees.org>
+F:	src/vnet/ipip/
+
+VNET TLS and TLS engine plugins
+M: 	Florin Coras <fcoras@cisco.com>
+M:	Ping Yu <ping.yu@intel.com>
+F:	src/vnet/tls
+F:	src/plugins/tlsopenssl
+F:	src/plugins/tlsmbedtls
 
 Plugin - ACL
 M:	Andrew Yourtchenko <ayourtch@gmail.com>
@@ -140,28 +151,47 @@ M:	Ole Troan <otroan@employees.org>
 F:	src/plugins/flowprobe/
 F:	src/plugins/flowprobe.am
 
-Plugin - SIXRD
-M:	Ole Troan <ot@cisco.com>
-F:	src/plugins/sixrd/
-F:	src/plugins/sixrd.am
-
 Plugin - GTPU
 M:	Hongjun Ni <hongjun.ni@intel.com>
 F:	src/plugins/gtpu/
 F:	src/plugins/gtpu.am
 
 Plugin - PPPoE
-M:  Hongjun Ni <hongjun.ni@intel.com>
-F:  src/plugins/pppoe/
-F:  src/plugins/pppoe.am
+M:	Hongjun Ni <hongjun.ni@intel.com>
+F:	src/plugins/pppoe/
+F:	src/plugins/pppoe.am
+
+Plugin - IPv6 Segment Routing Dynamic Proxy
+M:	Francois Clad <fclad@cisco.com>
+F:	src/plugins/srv6-ad/
+F:	src/plugins/srv6_ad.am
+
+Plugin - IPv6 Segment Routing Masquerading Proxy
+M:	Francois Clad <fclad@cisco.com>
+F:	src/plugins/srv6-am/
+F:	src/plugins/srv6_am.am
 
 Plugin - IPv6 Segment Routing Static Proxy
 M:	Francois Clad <fclad@cisco.com>
 F:	src/plugins/srv6-as/
 F:	src/plugins/srv6_as.am
 
+Plugin - Load Balancer
+M:      Pierre Pfister <ppfister@cisco.com>
+M:      Hongjun Ni <hongjun.ni@intel.com>
+F:      src/plugins/lb/
+F:      src/plugins/lb.am
+
+Plugin - NSH
+M:      Hongjun Ni <hongjun.ni@intel.com>
+M:      Keith Burns <alagalah@gmail.com>
+M:      Vengada <venggovi@cisco.com>
+F:      src/plugins/nsh/
+F:      src/plugins/nsh.am
+
 Test Infrastructure
 M:	Klement Sekera <ksekera@cisco.com>
+M:  Paul Vinciguerra <pvinci@vinciconsulting.com>
 F:	test/
 
 SVM Library
@@ -185,13 +215,9 @@ M:	Dave Barach <dave@barachs.net>
 F:	src/tools/perftool/
 
 Binary API Compiler
-M:	Dave Barach <dave@barachs.net>
+M:	Ole Troan <otroan@employees.org>
 F:	src/tools/vppapigen/
 
-Ganglia Telemetry Module
-M:	Dave Barach <dave@barachs.net>
-F:	gmod/
-
 THE REST
 C:	Contact vpp-dev Mailing List <vpp-dev@fd.io>
 F:	*