Skip to content

Commit

Permalink
Merge pull request #11948 from rhatdan/codespell
Browse files Browse the repository at this point in the history
codespell code
  • Loading branch information
openshift-merge-robot authored Oct 13, 2021
2 parents e3cf9b6 + 8600bce commit 1c156f2
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ spelled with complete minutiae.
binaries under the "binary", then "bin" links. Tar these files as
`podman-static.tar.gz`.
1. The `podman-vX.Y.Z.dmg` file is produced manually by someone in
posession of a developer signing key.
possession of a developer signing key.
1. In the directory where you downloaded the archives, run
`sha256sum *.tar.gz *.zip *.msi > shasums` to generate SHA sums.
1. Go to `https://github.com/containers/podman/releases/tag/vX.Y.Z` and
Expand Down
2 changes: 1 addition & 1 deletion cmd/podman/pods/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func create(cmd *cobra.Command, args []string) error {
}
createOptions.Share = nil
} else {
// reassign certain optios for lbpod api, these need to be populated in spec
// reassign certain options for lbpod api, these need to be populated in spec
flags := cmd.Flags()
infraOptions.Net, err = common.NetFlagsToNetOptions(nil, *flags, false)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-pod-logs.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Note: Long running command of `podman pod log` with a `-f` or `--follow` needs t

#### **--container**, **-c**

By default `podman pod logs` retrives logs for all the containers available within the pod differentiate by field `container`. However there are use-cases where user would want to limit the log stream only to a particular container of a pod for such cases `-c` can be used like `podman pod logs -c ctrNameorID podname`.
By default `podman pod logs` retrieves logs for all the containers available within the pod differentiate by field `container`. However there are use-cases where user would want to limit the log stream only to a particular container of a pod for such cases `-c` can be used like `podman pod logs -c ctrNameorID podname`.

#### **--follow**, **-f**

Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-volume-import.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Print usage statement
## EXAMPLES

```
$ gunzip -c hellow.tar.gz | podman volume import myvol -
$ gunzip -c hello.tar.gz | podman volume import myvol -
```
```
$ podman volume import myvol test.tar
Expand Down
2 changes: 1 addition & 1 deletion libpod/container_internal_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -2016,7 +2016,7 @@ func (c *Container) generateHosts(path string) (string, error) {
}

// based on networking mode we may want to append the localhost
// if there isn't any record for it and also this shoud happen
// if there isn't any record for it and also this should happen
// in slirp4netns and similar network modes.
func (c *Container) appendLocalhost(hosts string) string {
if !strings.Contains(hosts, "localhost") &&
Expand Down
2 changes: 1 addition & 1 deletion libpod/network/cni/cni_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func createNetworkFromCNIConfigList(conf *libcni.NetworkConfigList, confPath str
}

default:
// A warning would be good but users would get this warning everytime so keep this at info level.
// A warning would be good but users would get this warning every time so keep this at info level.
logrus.Infof("Unsupported CNI config type %s in %s, this network can still be used but inspect or list cannot show all information",
firstPlugin.Network.Type, confPath)
}
Expand Down
2 changes: 1 addition & 1 deletion libpod/network/cni/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ var _ = Describe("Config", func() {
Expect(networks).To(HaveLen(0))
})

It("crate bridge network with used interface name", func() {
It("create bridge network with used interface name", func() {
network := types.Network{
NetworkInterface: "cni-podman9",
}
Expand Down
2 changes: 1 addition & 1 deletion libpod/network/types/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ type NetInterface struct {
MacAddress net.HardwareAddr `json:"mac_address"`
}

// NetAddress contains the subnet and gatway.
// NetAddress contains the subnet and gateway.
type NetAddress struct {
// Subnet of this NetAddress. Note that the subnet contains the
// actual ip of the net interface and not the network address.
Expand Down
2 changes: 1 addition & 1 deletion libpod/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ func (p *Pod) InfraContainerID() (string, error) {
return p.infraContainerID()
}

// infraContainer is the unlocked versio of InfraContainer which returns the infra container
// infraContainer is the unlocked version of InfraContainer which returns the infra container
func (p *Pod) infraContainer() (*Container, error) {
id, err := p.infraContainerID()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/containers_conf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ var _ = Describe("Podman run", func() {
Expect(session.ErrorToString()).To(ContainSubstring("invalid image_copy_tmp_dir"))
})

It("podman system sevice --help shows (default 20)", func() {
It("podman system service --help shows (default 20)", func() {
SkipIfRemote("this test is only for local")
result := podmanTest.Podman([]string{"system", "service", "--help"})
result.WaitWithDefaultTimeout()
Expand Down
2 changes: 1 addition & 1 deletion test/system/250-systemd.bats
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ function service_cleanup() {
cname3=$(random_string)
run_podman create --restart=on-failure:42 --name $cname3 $IMAGE
run_podman generate systemd --new $cname3
is "$output" ".*Restart=on-failure.*" "on-failure:xx is parsed correclty"
is "$output" ".*Restart=on-failure.*" "on-failure:xx is parsed correctly"
is "$output" ".*StartLimitBurst=42.*" "on-failure:xx is parsed correctly"

run_podman rm -t 0 -f $cname $cname2 $cname3
Expand Down

0 comments on commit 1c156f2

Please sign in to comment.