Skip to content

Commit

Permalink
Merge pull request #1832 from mooncak/fix_typos
Browse files Browse the repository at this point in the history
Fix typos issues
  • Loading branch information
Mrunal Patel committed Oct 11, 2018
2 parents dd84943 + 89c85be commit a30f93c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/crio/config.go
Expand Up @@ -109,7 +109,7 @@ runtime_untrusted_workload = "{{ .RuntimeUntrustedWorkload }}"
# CRI-O will use the trusted container runtime for all containers.
default_workload_trust = "{{ .DefaultWorkloadTrust }}"
# If true, the runtime will not use use pivot_root, but instead use MS_MOVE.
# If true, the runtime will not use pivot_root, but instead use MS_MOVE.
no_pivot = {{ .NoPivot }}
# Path to the conmon binary, used for monitoring the OCI runtime.
Expand Down
2 changes: 1 addition & 1 deletion oci/container.go
Expand Up @@ -215,7 +215,7 @@ func (c *Container) Sandbox() string {
return c.sandbox
}

// Dir returns the the dir of the container
// Dir returns the dir of the container
func (c *Container) Dir() string {
return c.dir
}
Expand Down
2 changes: 1 addition & 1 deletion server/sandbox_remove.go
Expand Up @@ -31,7 +31,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
}

// If the sandbox isn't found we just return an empty response to adhere
// the the CRI interface which expects to not error out in not found
// the CRI interface which expects to not error out in not found
// cases.

resp = &pb.RemovePodSandboxResponse{}
Expand Down
2 changes: 1 addition & 1 deletion server/sandbox_stop_linux.go
Expand Up @@ -34,7 +34,7 @@ func (s *Server) stopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
}

// If the sandbox isn't found we just return an empty response to adhere
// the the CRI interface which expects to not error out in not found
// the CRI interface which expects to not error out in not found
// cases.

resp = &pb.StopPodSandboxResponse{}
Expand Down

0 comments on commit a30f93c

Please sign in to comment.