summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-02 22:32:05 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-02 22:32:05 +0000
commit689d0232d1964e53e829ed2c3a4e60db4fbc4933 (patch)
tree3915b63be3976f7986002b93513d820b3d63cd24 /pkg/sentry
parentf98b9a18076870f9e2fa4e300da07a3592f0def1 (diff)
parent43279c6734109eec2725513e3ada93342f4de8d2 (diff)
Merge release-20200522.0-62-g43279c67 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/watchdog/watchdog.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/watchdog/watchdog.go b/pkg/sentry/watchdog/watchdog.go
index 101497ed6..26ce1077f 100644
--- a/pkg/sentry/watchdog/watchdog.go
+++ b/pkg/sentry/watchdog/watchdog.go
@@ -328,8 +328,8 @@ func (w *Watchdog) reportStuckWatchdog() {
}
// doAction will take the given action. If the action is LogWarning, the stack
-// is not always dumpped to the log to prevent log flooding. "forceStack"
-// guarantees that the stack will be dumped regarless.
+// is not always dumped to the log to prevent log flooding. "forceStack"
+// guarantees that the stack will be dumped regardless.
func (w *Watchdog) doAction(action Action, forceStack bool, msg *bytes.Buffer) {
switch action {
case LogWarning: