kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #37794 from Lihua93/fixtypos

Browse source 
Fix typos in comment
This commit is contained in:
Sebastiaan van Stijn 2018-09-07 16:46:46 +02:00 committed by GitHub
commit e33ea4fbde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/cluster/executor/container/controller.go
View file

@ -527,7 +527,7 @@ func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, opti
} }
if msg.Err != nil { if msg.Err != nil {
// the defered cancel closes the adapter's log stream // the deferred cancel closes the adapter's log stream
return msg.Err return msg.Err
} }

2
daemon/graphdriver/lcow/lcow.go
View file

@ -673,7 +673,7 @@ func (d *Driver) Get(id, mountLabel string) (containerfs.ContainerFS, error) {
title := fmt.Sprintf("lcowdriver: get: %s", id) title := fmt.Sprintf("lcowdriver: get: %s", id)
logrus.Debugf(title) logrus.Debugf(title)
// Generate the mounts needed for the defered operation. // Generate the mounts needed for the deferred operation.
disks, err := d.getAllMounts(id) disks, err := d.getAllMounts(id)
if err != nil { if err != nil {
logrus.Debugf("%s failed to get all layer details for %s: %s", title, d.dir(id), err) logrus.Debugf("%s failed to get all layer details for %s: %s", title, d.dir(id), err)

2
daemon/oci_linux_test.go
View file

@ -35,7 +35,7 @@ func TestTmpfsDevShmNoDupMount(t *testing.T) {
}, },
} }
// Mimick the code flow of daemon.createSpec(), enough to reproduce the issue // Mimic the code flow of daemon.createSpec(), enough to reproduce the issue
ms, err := d.setupMounts(c) ms, err := d.setupMounts(c)
assert.Check(t, err) assert.Check(t, err)