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

Merge pull request #281 from mlaventure/use-protobuf-timestamp

Browse source 
Use protobuf timestamp
This commit is contained in:
Kenfe-Mickaël Laventure 2016-07-05 13:37:41 -07:00 • committed by GitHub
commit 6dd2f1c422
17 changed files with 1212 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

4
runtime/container.go
View file

@ -251,8 +251,8 @@ func (c *container) Delete() error {
args := c.runtimeArgs
args = append(args, "delete", c.id)
if derr := exec.Command(c.runtime, args...).Run(); err == nil {
err = derr
if b, derr := exec.Command(c.runtime, args...).CombinedOutput(); err != nil {
err = fmt.Errorf("%s: %q", derr, string(b))
}
return err
}