summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-16 09:38:35 -0700
committerGitHub <noreply@github.com>2019-04-16 09:38:35 -0700
commita87cf6fef8f84ded410d547aa772b8f942c5f273 (patch)
tree32f14d5ef13b6ae50db770cac130deb83e2b154e /cmd/podman
parenta2e9626d92dedb182a500c3a0f04dcc0499a6d54 (diff)
parent7cea949f04214871bba864c4348c64bbdbfba8a1 (diff)
downloadpodman-a87cf6fef8f84ded410d547aa772b8f942c5f273.tar.gz
podman-a87cf6fef8f84ded410d547aa772b8f942c5f273.tar.bz2
podman-a87cf6fef8f84ded410d547aa772b8f942c5f273.zip
Merge pull request #2949 from baude/remotecontainercommands
podman-remote container commands
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/commands.go4
-rw-r--r--cmd/podman/container.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 6156fc2f8..0e5deb627 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -49,8 +49,6 @@ func getContainerSubCommands() []*cobra.Command {
_cleanupCommand,
_commitCommand,
_execCommand,
- _exportCommand,
- _killCommand,
_mountCommand,
_pauseCommand,
_portCommand,
@@ -58,7 +56,6 @@ func getContainerSubCommands() []*cobra.Command {
_refreshCommand,
_restartCommand,
_restoreCommand,
- _rmCommand,
_runlabelCommand,
_startCommand,
_statsCommand,
@@ -66,7 +63,6 @@ func getContainerSubCommands() []*cobra.Command {
_topCommand,
_umountCommand,
_unpauseCommand,
- _waitCommand,
}
}
diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index 380d1f250..39c4f0c5d 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -54,10 +54,14 @@ var (
_containerExistsCommand,
_contInspectSubCommand,
_diffCommand,
+ _exportCommand,
_createCommand,
+ _killCommand,
_listSubCommand,
_logsCommand,
_runCommand,
+ _rmCommand,
+ _waitCommand,
}
)