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 /runsc/boot/loader.go | |
parent | d147e6d1b29d25607bcdcdb0beddb5122fea085e (diff) | |
parent | b30cfb1df72e201c6caf576bbef8fcc968df2d41 (diff) |
Merge branch 'master' into iptables-write-input-drop
Diffstat (limited to 'runsc/boot/loader.go')
-rw-r--r-- | runsc/boot/loader.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index bc1d0c1bb..fad72f4ab 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -20,7 +20,6 @@ import ( mrand "math/rand" "os" "runtime" - "sync" "sync/atomic" "syscall" gtime "time" @@ -46,6 +45,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/watchdog" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/link/sniffer" "gvisor.dev/gvisor/pkg/tcpip/network/arp" |