Skip to content

Commit

Permalink
Merge pull request #10231 from rhatdan/cleanup
Browse files Browse the repository at this point in the history
codespell cleanup
  • Loading branch information
openshift-merge-robot authored May 6, 2021
2 parents ed6f399 + 0d1ebc1 commit 9b9bd9e
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cmd/podman/common/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
createFlags.StringSliceVar(
&cf.GroupAdd,
groupAddFlagName, []string{},
"Add additional groups to the primary container process. 'keep-groups' allows container processes to use suplementary groups.",
"Add additional groups to the primary container process. 'keep-groups' allows container processes to use supplementary groups.",
)
_ = cmd.RegisterFlagCompletionFunc(groupAddFlagName, completion.AutocompleteNone)

Expand Down
4 changes: 2 additions & 2 deletions contrib/dependabot-dance
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ function branch_dance() {
echo
echo "Commit author is '$author' (expected 'dependabot')"
echo -n "Continue? [y/N] "
read ans
case "$ans" in
read answer
case "$answer" in
[yY]*) ;;
*) exit 1;;
esac
Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-create.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ The `container_manage_cgroup` boolean must be enabled for this to be allowed on

#### **\-\-timeout**=*seconds*

Maximimum time a container is allowed to run before conmon sends it the kill
Maximum time a container is allowed to run before conmon sends it the kill
signal. By default containers will run until they exit or are stopped by
`podman stop`.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-run.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ setsebool -P container_manage_cgroup true

#### **\-\-timeout**=*seconds*

Maximimum time a container is allowed to run before conmon sends it the kill
Maximum time a container is allowed to run before conmon sends it the kill
signal. By default containers will run until they exit or are stopped by
`podman stop`.

Expand Down
2 changes: 1 addition & 1 deletion libpod/container_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ type ContainerMiscConfig struct {
StopSignal uint `json:"stopSignal,omitempty"`
// StopTimeout is the signal that will be used to stop the container
StopTimeout uint `json:"stopTimeout,omitempty"`
// Timeout is maximimum time a container will run before getting the kill signal
// Timeout is maximum time a container will run before getting the kill signal
Timeout uint `json:"timeout,omitempty"`
// Time container was created
CreatedTime time.Time `json:"createdTime"`
Expand Down
2 changes: 1 addition & 1 deletion libpod/define/container_inspect.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type InspectContainerConfig struct {
Secrets []*InspectSecret `json:"Secrets,omitempty"`
// Timeout is time before container is killed by conmon
Timeout uint `json:"Timeout"`
// StopTimeout is time before container is stoped when calling stop
// StopTimeout is time before container is stopped when calling stop
StopTimeout uint `json:"StopTimeout"`
}

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/ps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ var _ = Describe("Podman ps", func() {
Expect(result.ExitCode()).To(Equal(0))
Expect(result.OutputToString()).To(Equal(cid))

// Query by trunctated image name should not match ( should return empty output )
// Query by truncated image name should not match ( should return empty output )
result = podmanTest.Podman([]string{"ps", "-q", "--no-trunc", "-a", "--filter", "ancestor=quay.io/libpod/alpi"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
Expand Down
2 changes: 1 addition & 1 deletion test/upgrade/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ Where To Go From Here

* Figuring out how/if to run variations with different config files
(e.g. running OLD-PODMAN that creates a user libpod.conf, tweaking
that in the test, then running NEW-PODMAN upgrate tests)
that in the test, then running NEW-PODMAN upgrade tests)

0 comments on commit 9b9bd9e

Please sign in to comment.