From: Doug Goldstein <cardoe@cardoe.com>
Date: Thu, 15 Mar 2018 15:54:04 +0000 (-0500)
Subject: ci: add new bits to MAINTAINERS combine with Travis
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~349
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea9070190315d26c7eb90555041033ae4a21cfe7;p=xen.git

ci: add new bits to MAINTAINERS combine with Travis

Created a new section just called 'CI' since this is adding GitLab CI
and still leaving the old Travis CI files around. This consolidates the
two sections and adds the new files as well as adding another Travis
file that was missing.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index a5b3e95f45..eace09ed22 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,16 @@ BLKTAP2
 S:	Orphaned
 F:	tools/blktap2/
 
+Continuous Integration (CI)
+M:	Doug Goldstein <cardoe@cardoe.com>
+W:	https://gitlab.com/xen-project/xen
+W:	https://travis-ci.org/xen-project/xen
+S:	Supported
+F:	.gitlab-ci.yml
+F:	.travis.yml
+F:	automation/
+F:	scripts/travis-build
+
 CPU POOLS
 M:	Juergen Gross <jgross@suse.com>
 M:	Dario Faggioli <dfaggioli@suse.com>
@@ -384,12 +394,6 @@ F:	xen/common/tmem*
 F:	xen/include/xen/tmem*
 F:	docs/misc/tmem*
 
-TRAVIS CI
-M:	Doug Goldstein <cardoe@cardoe.com>
-W:	https://travis-ci.org/xen-project/xen
-S:	Supported
-F:	.travis.yml
-
 UNMODIFIED LINUX PV DRIVERS
 M:	Jan Beulich <jbeulich@suse.com>
 S:	Obsolete