diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
| commit | b615f94aeacb2c21bb59c8b44f303e7b7ca05ad6 (patch) | |
| tree | 79907e842eeba2a1f01acb5b5661800dc6ef2174 /pkg/sentry/kernel/task_log.go | |
| parent | d6a2e01d3e57e0837c7e5cfda3b56c4dcfbb4627 (diff) | |
| parent | 148fda60e8dee29f2df85e3104e3d5de1a225bcf (diff) | |
Merge branch 'master' into ipt-udp-matchers
Diffstat (limited to 'pkg/sentry/kernel/task_log.go')
| -rw-r--r-- | pkg/sentry/kernel/task_log.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_log.go b/pkg/sentry/kernel/task_log.go index 0fb3661de..41259210c 100644 --- a/pkg/sentry/kernel/task_log.go +++ b/pkg/sentry/kernel/task_log.go @@ -20,7 +20,7 @@ import ( "sort" "gvisor.dev/gvisor/pkg/log" - "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/usermem" ) const ( |