github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2609 from Callisto13/pr-fix-typos

Browse Source 
Fix teeny tiny typos
This commit is contained in:
Phil Estes
2018-09-05 10:26:07 -04:00
committed by GitHub
parent 87a9d6e22a 32e6aa742b
commit 96986c04db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/v1/linux/runtime.go
View File

@@ -204,7 +204,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts runtime.CreateOpts
log.G(ctx).WithError(err).WithFields(logrus.Fields{ log.G(ctx).WithError(err).WithFields(logrus.Fields{
"id": id, "id": id,
"namespace": namespace, "namespace": namespace,
}).Warn("failed to clen up after killed shim") }).Warn("failed to clean up after killed shim")
} }
} }
shimopt = ShimRemote(r.config, r.address, cgroup, exitHandler) shimopt = ShimRemote(r.config, r.address, cgroup, exitHandler)

2
sys/socket_unix.go
View File

@@ -42,7 +42,7 @@ func CreateUnixSocket(path string) (net.Listener, error) {
return net.Listen("unix", path) return net.Listen("unix", path)
} }
// GetLocalListener returns a listerner out of a unix socket. // GetLocalListener returns a listener out of a unix socket.
func GetLocalListener(path string, uid, gid int) (net.Listener, error) { func GetLocalListener(path string, uid, gid int) (net.Listener, error) {
// Ensure parent directory is created // Ensure parent directory is created
if err := mkdirAs(filepath.Dir(path), uid, gid); err != nil { if err := mkdirAs(filepath.Dir(path), uid, gid); err != nil {