diff options
author | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
---|---|---|
committer | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
commit | 31e49f4b19309259baeeb63e7b6ef41f8edd6d35 (patch) | |
tree | ad6cae1ad4f173946eb68156653bea84d7254f81 /pkg/log/log.go | |
parent | d147e6d1b29d25607bcdcdb0beddb5122fea085e (diff) | |
parent | b30cfb1df72e201c6caf576bbef8fcc968df2d41 (diff) |
Merge branch 'master' into iptables-write-input-drop
Diffstat (limited to 'pkg/log/log.go')
-rw-r--r-- | pkg/log/log.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/log/log.go b/pkg/log/log.go index 9387586e6..91a81b288 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -25,12 +25,12 @@ import ( stdlog "log" "os" "runtime" - "sync" "sync/atomic" "syscall" "time" "gvisor.dev/gvisor/pkg/linewriter" + "gvisor.dev/gvisor/pkg/sync" ) // Level is the log level. |