Merge pull request #919 from ericchiang/update-maintainers

*: update maintainers

Merge pull request #919 from ericchiang/update-maintainers
*: update maintainers
4507e99a · rithu leena john · GitHub · 5c56fb76 · 49e05b95 · 4507e99a
Commit 4507e99a authored Apr 21, 2017 by rithu leena john Committed by GitHub Apr 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Dockerfile Dockerfile +1 -1

MAINTAINERS MAINTAINERS +3 -0

No files found.
--- a/Dockerfile
+++ b/Dockerfile
 FROM alpine:3.4

 MAINTAINER Ed Rooth <ed.rooth@coreos.com>
-MAINTAINER Eric Chiang <eric.chiang@coreos.com>
+MAINTAINER Lucas Servén <lucas.serven@coreos.com>
 MAINTAINER Rithu John <rithu.john@coreos.com>

 # Dex connectors, such as GitHub and Google logins require root certificates.

--- a/MAINTAINERS
+++ b/MAINTAINERS
+Ed Rooth <ed.rooth@coreos.com> (@sym3tri)
+Lucas Servén <lucas.serven@coreos.com> (@squat)
+Rithu John <rithu.john@coreos.com> (@rithujohn191)