diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
commit | d09b1da02d67a8a51f1b41e0a8e9026218ffa20a (patch) | |
tree | b32df508ac0b9087e3319a1d2b33dfbb86db8ad1 /pkg/sentry/socket/rpcinet/conn | |
parent | aca2ac5c956a7542eebf50806b0e0171c8caa816 (diff) | |
parent | 27500d529f7fb87eef8812278fd1bbca67bcba72 (diff) |
Merge release-20191213.0-96-g27500d5 (automated)
Diffstat (limited to 'pkg/sentry/socket/rpcinet/conn')
-rw-r--r-- | pkg/sentry/socket/rpcinet/conn/conn.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/rpcinet/conn/conn.go b/pkg/sentry/socket/rpcinet/conn/conn.go index 356adad99..02f39c767 100644 --- a/pkg/sentry/socket/rpcinet/conn/conn.go +++ b/pkg/sentry/socket/rpcinet/conn/conn.go @@ -17,12 +17,12 @@ package conn import ( "fmt" - "sync" "sync/atomic" "syscall" "github.com/golang/protobuf/proto" "gvisor.dev/gvisor/pkg/binary" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/syserr" "gvisor.dev/gvisor/pkg/unet" |