Merge pull request #3678 from yuxiaobo96/containerd-update

estesp · web-flow · commit 4cd5de74bd0b · 2019-09-25T08:27:24.000-04:00
Word spelling correction
diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go
@@ -29,7 +29,7 @@ func serviceFlags() []cli.Flag {
 	return nil
 }
 
-// applyPlatformFlags applys platform-specific flags.
+// applyPlatformFlags applies platform-specific flags.
 func applyPlatformFlags(context *cli.Context) {
 }
 
diff --git a/container_linux_test.go b/container_linux_test.go
@@ -174,7 +174,7 @@ func TestShimInCgroup(t *testing.T) {
 		t.Fatal(err)
 	}
 	if len(processes) == 0 {
-		t.Errorf("created cgroup should have atleast one process inside: %d", len(processes))
+		t.Errorf("created cgroup should have at least one process inside: %d", len(processes))
 	}
 	if err := task.Kill(ctx, unix.SIGKILL); err != nil {
 		t.Fatal(err)
diff --git a/images/archive/importer.go b/images/archive/importer.go
@@ -124,7 +124,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt
 	}
 
 	// If OCI layout was given, interpret the tar as an OCI layout.
-	// When not provided, the layout of the tar will be interpretted
+	// When not provided, the layout of the tar will be interpreted
 	// as Docker v1.1 or v1.2.
 	if ociLayout.Version != "" {
 		if ociLayout.Version != ocispec.ImageLayoutVersion {
diff --git a/oci/spec.go b/oci/spec.go
@@ -78,7 +78,7 @@ func generateDefaultSpecWithPlatform(ctx context.Context, platform, id string, s
 	return err
 }
 
-// ApplyOpts applys the options to the given spec, injecting data from the
+// ApplyOpts applies the options to the given spec, injecting data from the
 // context, client and container instance.
 func ApplyOpts(ctx context.Context, client Client, c *containers.Container, s *Spec, opts ...SpecOpts) error {
 	for _, o := range opts {
diff --git a/process.go b/process.go
@@ -61,7 +61,7 @@ func NewExitStatus(code uint32, t time.Time, err error) *ExitStatus {
 	}
 }
 
-// ExitStatus encapsulates a process' exit status.
+// ExitStatus encapsulates a process's exit status.
 // It is used by `Wait()` to return either a process exit code or an error
 type ExitStatus struct {
 	code     uint32
diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go
@@ -30,7 +30,7 @@ func TestContextCustomKeyPrefix(t *testing.T) {
 	ctx = WithMediaTypeKeyPrefix(ctx, images.MediaTypeDockerSchema2Layer, "bananas")
 	ctx = WithMediaTypeKeyPrefix(ctx, cmt, "apples")
 
-	// makes sure tha even though we've supplied some custom handling, the built-in still works
+	// makes sure that even though we've supplied some custom handling, the built-in still works
 	t.Run("normal supported case", func(t *testing.T) {
 		desc := ocispec.Descriptor{MediaType: ocispec.MediaTypeImageLayer}
 		expected := "layer-"

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func serviceFlags() []cli.Flag {`
`29`	`29`	`return nil`
`30`	`30`	`}`
`31`	`31`
`32`		`-// applyPlatformFlags applys platform-specific flags.`
	`32`	`+// applyPlatformFlags applies platform-specific flags.`
`33`	`33`	`func applyPlatformFlags(context *cli.Context) {`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func TestShimInCgroup(t *testing.T) {`
`174`	`174`	`t.Fatal(err)`
`175`	`175`	`}`
`176`	`176`	`if len(processes) == 0 {`
`177`		`- t.Errorf("created cgroup should have atleast one process inside: %d", len(processes))`
	`177`	`+ t.Errorf("created cgroup should have at least one process inside: %d", len(processes))`
`178`	`178`	`}`
`179`	`179`	`if err := task.Kill(ctx, unix.SIGKILL); err != nil {`
`180`	`180`	`t.Fatal(err)`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func ImportIndex(ctx context.Context, store content.Store, reader io.Reader, opt`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`// If OCI layout was given, interpret the tar as an OCI layout.`
`127`		`- // When not provided, the layout of the tar will be interpretted`
	`127`	`+ // When not provided, the layout of the tar will be interpreted`
`128`	`128`	`// as Docker v1.1 or v1.2.`
`129`	`129`	`if ociLayout.Version != "" {`
`130`	`130`	`if ociLayout.Version != ocispec.ImageLayoutVersion {`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func generateDefaultSpecWithPlatform(ctx context.Context, platform, id string, s`
`78`	`78`	`return err`
`79`	`79`	`}`
`80`	`80`
`81`		`-// ApplyOpts applys the options to the given spec, injecting data from the`
	`81`	`+// ApplyOpts applies the options to the given spec, injecting data from the`
`82`	`82`	`// context, client and container instance.`
`83`	`83`	`func ApplyOpts(ctx context.Context, client Client, c containers.Container, s Spec, opts ...SpecOpts) error {`
`84`	`84`	`for _, o := range opts {`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func NewExitStatus(code uint32, t time.Time, err error) *ExitStatus {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-// ExitStatus encapsulates a process' exit status.`
	`64`	`+// ExitStatus encapsulates a process's exit status.`
`65`	`65`	// It is used by `Wait()` to return either a process exit code or an error
`66`	`66`	`type ExitStatus struct {`
`67`	`67`	`code uint32`