瀏覽代碼

Merge pull request #4589 from creack/update_maintainer

Update MAINTAINER email + add self to pkg/signal MAINTAINER
Victor Vieux 11 年之前
父節點
當前提交
0a6d9035cf

+ 1 - 1
MAINTAINERS

@@ -1,5 +1,5 @@
 Solomon Hykes <solomon@dotcloud.com> (@shykes)
 Solomon Hykes <solomon@dotcloud.com> (@shykes)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
 Victor Vieux <vieux@docker.com> (@vieux)
 Victor Vieux <vieux@docker.com> (@vieux)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 .travis.yml: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 .travis.yml: Tianon Gravi <admwiggin@gmail.com> (@tianon)

+ 1 - 1
contrib/host-integration/Dockerfile.dev

@@ -6,7 +6,7 @@
 #
 #
 
 
 FROM		ubuntu:12.10
 FROM		ubuntu:12.10
-MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
+MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 
 
 RUN		apt-get update && apt-get install -y wget git mercurial
 RUN		apt-get update && apt-get install -y wget git mercurial
 
 

+ 1 - 1
contrib/host-integration/Dockerfile.min

@@ -1,4 +1,4 @@
 FROM		busybox
 FROM		busybox
-MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
+MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 ADD		manager	  /usr/bin/
 ADD		manager	  /usr/bin/
 ENTRYPOINT	["/usr/bin/manager"]
 ENTRYPOINT	["/usr/bin/manager"]

+ 1 - 1
docs/sources/reference/builder.rst

@@ -481,7 +481,7 @@ For example you might add something like this:
     # VERSION               0.0.1
     # VERSION               0.0.1
 
 
     FROM      ubuntu
     FROM      ubuntu
-    MAINTAINER Guillaume J. Charmes <guillaume@dotcloud.com>
+    MAINTAINER Guillaume J. Charmes <guillaume@docker.com>
 
 
     # make sure the package repository is up to date
     # make sure the package repository is up to date
     RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
     RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list

+ 1 - 1
execdriver/MAINTAINERS

@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)

+ 1 - 1
pkg/libcontainer/MAINTAINERS

@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)

+ 1 - 1
pkg/netlink/MAINTAINERS

@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)

+ 2 - 0
pkg/signal/MAINTAINERS

@@ -0,0 +1,2 @@
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
+

+ 1 - 1
pkg/term/MAINTAINERS

@@ -1,2 +1,2 @@
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
 Solomon Hykes <solomon@dotcloud.com> (@shykes)
 Solomon Hykes <solomon@dotcloud.com> (@shykes)