Skip to content

Commit

Permalink
Add tonis and mickael as maintainers
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Crosby <[email protected]>
  • Loading branch information
crosbymichael committed Mar 21, 2016
1 parent 7e3c007 commit 1000723
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
29 changes: 21 additions & 8 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
# This file is compiled into the MAINTAINERS file in docker/opensource.
#
[Org]
[Org."Core maintainers"]
people = [
"crosbymichael",
]
[Org."Core maintainers"]
people = [
"crosbymichael",
"tonistiigi",
"mlaventure",
]

[people]

Expand All @@ -22,7 +24,18 @@

# ADD YOURSELF HERE IN ALPHABETICAL ORDER

[people.crosbymichael]
Name = "Michael Crosby"
Email = "[email protected]"
GitHub = "crosbymichael"
[people.crosbymichael]
Name = "Michael Crosby"
Email = "[email protected]"
GitHub = "crosbymichael"

[people.tonistiigi]
Name = "Tõnis Tiigi"
Email = "[email protected]"
GitHub = "tonistiigi"

[people.mlaventure]
Name = "Kenfe-Mickaël Laventure"
Email = "[email protected]"
GitHub = "mlaventure"

1 change: 1 addition & 0 deletions containerd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func daemon(address, stateDir string, concurrency int, runtimeName string) error
logrus.WithField("error", err).Warn("containerd: reap child processes")
}
default:
logrus.Infof("stopping containerd after receiving %s", ss)
server.Stop()
os.Exit(0)
}
Expand Down

0 comments on commit 1000723

Please sign in to comment.