diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2019-12-19 11:32:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 11:32:38 -0800 |
| commit | 0971ab57f728eaa7e8f84f338048e851f7b70976 (patch) | |
| tree | 5b27e50eb0cd186eb77eb0ae14123d57a2411df4 | |
| parent | 5f83f15ecb5098603ea275b279809e6a9eeef774 (diff) | |
| parent | 9aa55d97e564329f9b1c5b0b2c09c5f2bc1cc578 (diff) | |
| download | docker-0971ab57f728eaa7e8f84f338048e851f7b70976.tar.gz | |
Merge pull request #40257 from thaJeztah/bump_go_runc
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/containerd/go-runc/runc.go | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vendor.conf b/vendor.conf index b24957d355..3dc069d0ec 100644 --- a/vendor.conf +++ b/vendor.conf @@ -122,7 +122,7 @@ github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697 github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c github.com/containerd/cgroups 5fbad35c2a7e855762d3c60f2e474ffcad0d470a github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f -github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f +github.com/containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def github.com/containerd/typeurl 2a93cfde8c20b23de8eb84a5adbc234ddf7a9e8d github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f github.com/gogo/googleapis d31c731455cb061f42baff3bda55bad0118b126b # v1.2.0 diff --git a/vendor/github.com/containerd/go-runc/runc.go b/vendor/github.com/containerd/go-runc/runc.go index 613cc511c6..e83886a01f 100644 --- a/vendor/github.com/containerd/go-runc/runc.go +++ b/vendor/github.com/containerd/go-runc/runc.go @@ -172,7 +172,7 @@ func (r *Runc) Create(context context.Context, id, bundle string, opts *CreateOp } status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return err } @@ -251,7 +251,7 @@ func (r *Runc) Exec(context context.Context, id string, spec specs.Process, opts } status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return err } @@ -277,7 +277,7 @@ func (r *Runc) Run(context context.Context, id, bundle string, opts *CreateOpts) } status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return status, err } @@ -576,7 +576,7 @@ func (r *Runc) Restore(context context.Context, id, bundle string, opts *Restore } status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return status, err } @@ -682,7 +682,7 @@ func (r *Runc) runOrError(cmd *exec.Cmd) error { } status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return err } @@ -708,7 +708,7 @@ func cmdOutput(cmd *exec.Cmd, combined bool) ([]byte, error) { status, err := Monitor.Wait(cmd, ec) if err == nil && status != 0 { - err = fmt.Errorf("%s did not terminate sucessfully", cmd.Args[0]) + err = fmt.Errorf("%s did not terminate successfully", cmd.Args[0]) } return b.Bytes(), err |