docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: fix usage of some variables 

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 57e14714ee85e67f59d8c22aed23dc875cf2e58c)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Alexander Morozov 2016-06-22 10:40:32 -07:00 committed by Tibor Vass
parent de6b73a1a8
commit 926d66b50f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcontainerd/client_windows.go
View File

@ -296,9 +296,8 @@ func (clnt *client) Signal(containerID string, sig int) error {
} else {
// Terminate Process
if err := cont.hcsProcess.Kill(); err != nil {
// ignore errors
logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err)
// Ignore errors
err = nil
}
}

2
plugin/backend.go
View File

@ -118,7 +118,7 @@ func (pm *Manager) Push(name string, metaHeader http.Header, authConfig *types.A
_, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs)
// XXX: Ignore returning digest for now.
// Since digest needs to be written to the ProgressWriter.
return nil
return err
}
// Remove deletes plugin's root directory.