summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-30 07:49:27 -0800
committerGitHub <noreply@github.com>2018-11-30 07:49:27 -0800
commit96c4dd73029030bb07e10f0b5e562e8d88f81742 (patch)
treee9bc7a402095f076cb151abbae5512ae778e8904
parent3af62f620a4d4ed21db58e71f9ba7ace242ec742 (diff)
parent82bcef38954b4d03b7e047d7843e77bc94647c82 (diff)
downloadpodman-96c4dd73029030bb07e10f0b5e562e8d88f81742.tar.gz
podman-96c4dd73029030bb07e10f0b5e562e8d88f81742.tar.bz2
podman-96c4dd73029030bb07e10f0b5e562e8d88f81742.zip
Merge pull request #1906 from baude/addpsp
add pod short option to ps
-rw-r--r--cmd/podman/ps.go2
-rw-r--r--completions/bash/podman2
-rw-r--r--docs/podman-ps.1.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go
index 83274c9a8..0b03388a2 100644
--- a/cmd/podman/ps.go
+++ b/cmd/podman/ps.go
@@ -184,7 +184,7 @@ var (
Usage: "Display the extended information",
},
cli.BoolFlag{
- Name: "pod",
+ Name: "pod, p",
Usage: "Print the ID and name of the pod the containers are associated with",
},
cli.BoolFlag{
diff --git a/completions/bash/podman b/completions/bash/podman
index 076ec7ab4..3cccf2192 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -2033,7 +2033,7 @@ _podman_ps() {
--help -h
--latest -l
--no-trunc
- --pod
+ --pod -p
--quiet -q
--size -s
--namespace --ns
diff --git a/docs/podman-ps.1.md b/docs/podman-ps.1.md
index 2cb77ffed..7333a1095 100644
--- a/docs/podman-ps.1.md
+++ b/docs/podman-ps.1.md
@@ -24,7 +24,7 @@ all the containers information. By default it lists:
Show all the containers, default is only running containers
-**--pod**
+**--pod, -p**
Display the pods the containers are associated with