vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add tonis and mickael as maintainers

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-03-21 13:04:38 -07:00
parent 7e3c007ea3
commit 1000723f2d
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
MAINTAINERS
View file

@ -9,10 +9,12 @@
# This file is compiled into the MAINTAINERS file in docker/opensource. # This file is compiled into the MAINTAINERS file in docker/opensource.
# #
[Org] [Org]
[Org."Core maintainers"] [Org."Core maintainers"]
people = [ people = [
"crosbymichael", "crosbymichael",
] "tonistiigi",
"mlaventure",
]
[people] [people]
@ -22,7 +24,18 @@
# ADD YOURSELF HERE IN ALPHABETICAL ORDER # ADD YOURSELF HERE IN ALPHABETICAL ORDER
[people.crosbymichael] [people.crosbymichael]
Name = "Michael Crosby" Name = "Michael Crosby"
Email = "crosbymichael@gmail.com" Email = "crosbymichael@gmail.com"
GitHub = "crosbymichael" GitHub = "crosbymichael"
[people.tonistiigi]
Name = "Tõnis Tiigi"
Email = "tonis@docker.com"
GitHub = "tonistiigi"
[people.mlaventure]
Name = "Kenfe-Mickaël Laventure"
Email = "mickael.laventure@docker.com"
GitHub = "mlaventure"

1
containerd/main.go
View file

@ -112,6 +112,7 @@ func daemon(address, stateDir string, concurrency int, runtimeName string) error
logrus.WithField("error", err).Warn("containerd: reap child processes") logrus.WithField("error", err).Warn("containerd: reap child processes")
} }
default: default:
logrus.Infof("stopping containerd after receiving %s", ss)
server.Stop() server.Stop()
os.Exit(0) os.Exit(0)
} }