diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-09-27 22:34:45 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-09-27 22:34:45 +0000 |
| commit | 0240b0d6205e5e8ca6e7a9f7608493c24a4dbb93 (patch) | |
| tree | 0b3e7665d173473cc38a4b63a20d6ab8f0113752 /runsc | |
| parent | 5de2e201f057efc38ae83fae9b3b46a841f79f26 (diff) | |
| parent | e251f6cc5c2641e000846b35e4aa7f0d41c4b319 (diff) | |
Merge release-20210921.0-36-ge251f6cc5 (automated)
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/loader.go | 2 | ||||
| -rw-r--r-- | runsc/container/container.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index b46d84e5a..fb67a8072 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -49,13 +49,13 @@ import ( "gvisor.dev/gvisor/pkg/sentry/loader" "gvisor.dev/gvisor/pkg/sentry/pgalloc" "gvisor.dev/gvisor/pkg/sentry/platform" - "gvisor.dev/gvisor/pkg/sentry/sighandling" "gvisor.dev/gvisor/pkg/sentry/socket/netfilter" "gvisor.dev/gvisor/pkg/sentry/syscalls/linux/vfs2" "gvisor.dev/gvisor/pkg/sentry/time" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/vfs" "gvisor.dev/gvisor/pkg/sentry/watchdog" + "gvisor.dev/gvisor/pkg/sighandling" "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/link/ethernet" diff --git a/runsc/container/container.go b/runsc/container/container.go index 9c0004753..7f991444e 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -35,7 +35,7 @@ import ( "gvisor.dev/gvisor/pkg/cleanup" "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/sentry/control" - "gvisor.dev/gvisor/pkg/sentry/sighandling" + "gvisor.dev/gvisor/pkg/sighandling" "gvisor.dev/gvisor/runsc/boot" "gvisor.dev/gvisor/runsc/cgroup" "gvisor.dev/gvisor/runsc/config" |