lisp: move cp tests to unittest

[vpp.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bb62ca3..4e6ccd0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -332,11 +332,7 @@ M: Dave Barach <dave@barachs.net>
 F:     src/plugins/nsim/
 
 Test Infrastructure
-<<<<<<< HEAD
-I:  tests
-=======
 I:     tests
->>>>>>> d84661c... tests: refactor VppDiedError.
 M:     Klement Sekera <ksekera@cisco.com>
 M:     Paul Vinciguerra <pvinci@vinciconsulting.com>
 F:     test/
@@ -412,6 +408,11 @@ M: Neale Ranns <nranns@cisco.com>
 M:     Mohsin Kazmi <sykazmi@cisco.com>
 F:     extras/vom/vom/
 
+Plugin - Host Stack Applications
+I:     hsa
+M:     Florin Coras <fcoras@cisco.com>
+F:     src/plugins/hs_apps/
+
 THE REST
 I:     misc
 C:     Contact vpp-dev Mailing List <vpp-dev@fd.io>