Merge pull request #25111 from coolljt0725/fix_25110

Fix daemon panic on restoring containers
This commit is contained in:
Brian Goff 2016-07-27 11:43:45 -04:00 committed by GitHub
commit abf0e9f071

View file

@ -563,6 +563,8 @@ func (clnt *client) Restore(containerID string, options ...CreateOption) error {
clnt.remote.Lock()
return nil
}
// relock because of the defer
clnt.remote.Lock()
clnt.deleteContainer(containerID)