Merge pull request #5500 from tianon/fix-maintainers-format

Fix various MAINTAINERS format inconsistencies
2014-04-30 10:55:45 -07:00 · 2014-04-30 10:55:45 -07:00 · e8f8f1c729
commit e8f8f1c729
parent 0c5375146a defecac279
7 changed files with 6 additions and 7 deletions
--- a/contrib/zfs/MAINTAINERS
+++ b/contrib/zfs/MAINTAINERS
@ -1 +1 @@
-Gurjeet Singh <gurjeet@singh.im> (gurjeet.singh.im)
+Gurjeet Singh <gurjeet@singh.im> (@gurjeet)
--- a/engine/MAINTAINERS
+++ b/engine/MAINTAINERS
@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
--- a/integration/MAINTAINERS
+++ b/integration/MAINTAINERS
@ -1,4 +1,4 @@
-Solomon Hykes <s@docker.com>
+Solomon Hykes <s@docker.com> (@shykes)
 # WE ARE LOOKING FOR VOLUNTEERS TO HELP CLEAN THIS UP.
 # TO VOLUNTEER PLEASE OPEN A PULL REQUEST ADDING YOURSELF TO THIS FILE.
 # WE WILL HELP YOU GET STARTED. THANKS!
--- a/pkg/beam/MAINTAINERS
+++ b/pkg/beam/MAINTAINERS
@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
--- a/pkg/dockerscript/MAINTAINERS
+++ b/pkg/dockerscript/MAINTAINERS
@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
--- a/pkg/signal/MAINTAINERS
+++ b/pkg/signal/MAINTAINERS
@ -1,2 +1 @@
 Guillaume J. Charmes <guillaume@docker.com> (@creack)
-
--- a/server/MAINTAINERS
+++ b/server/MAINTAINERS
@ -1 +1 @@
-Solomon Hykes <solomon@docker.com>
+Solomon Hykes <solomon@docker.com> (@shykes)
				`@ -1,2 +1 @@`
				`Guillaume J. Charmes <guillaume@docker.com> (@creack)`