Merge pull request #1120 from ericchiang/update-maintainers

*: update maintainers

Merge pull request #1120 from ericchiang/update-maintainers
*: update maintainers
04e276f2 · Eric Chiang · GitHub · 97d395e3 · df075d8b · 04e276f2
Unverified Commit 04e276f2 authored Nov 08, 2017 by Eric Chiang Committed by GitHub Nov 08, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

Dockerfile Dockerfile +0 -4

MAINTAINERS MAINTAINERS +1 -2

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

-MAINTAINER Ed Rooth <ed.rooth@coreos.com>
-MAINTAINER Lucas Servén <lucas.serven@coreos.com>
-MAINTAINER Rithu John <rithu.john@coreos.com>
-
 RUN apk add --no-cache --update alpine-sdk

 COPY . /go/src/github.com/coreos/dex

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