summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-03 10:59:33 -0500
committerGitHub <noreply@github.com>2020-12-03 10:59:33 -0500
commit70284b18cc7d4dc478c439cdda60ba64cfec060b (patch)
treee8bdc4217c89c7891116da9977d8e4ec4848bd0e /cmd
parentc675d8a3c6335e495f7e0f055443a7acb63de911 (diff)
parentf00cc25a7c655022785389e6778693c6a7763bdc (diff)
downloadpodman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.gz
podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.tar.bz2
podman-70284b18cc7d4dc478c439cdda60ba64cfec060b.zip
Merge pull request #8479 from rhatdan/log
Drop default log-level from error to warn
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common/completion.go2
-rw-r--r--cmd/podman/root.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go
index 7fed15e5e..25f4d0f79 100644
--- a/cmd/podman/common/completion.go
+++ b/cmd/podman/common/completion.go
@@ -22,7 +22,7 @@ var (
// ChangeCmds is the list of valid Change commands to passed to the Commit call
ChangeCmds = []string{"CMD", "ENTRYPOINT", "ENV", "EXPOSE", "LABEL", "ONBUILD", "STOPSIGNAL", "USER", "VOLUME", "WORKDIR"}
// LogLevels supported by podman
- LogLevels = []string{"debug", "info", "warn", "error", "fatal", "panic"}
+ LogLevels = []string{"debug", "info", "warn", "warning", "error", "fatal", "panic"}
)
type completeType int
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 7840e6100..0830a62a5 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -71,7 +71,7 @@ var (
DisableFlagsInUseLine: true,
}
- logLevel = "error"
+ logLevel = "warn"
useSyslog bool
requireCleanup = true
)