diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-06-20 18:39:53 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-06-20 18:39:53 +0000 |
| commit | f512b9ebad84a3336d077d41360107988d90c44e (patch) | |
| tree | 25e8dc7cc9a43151e5a78efba0bab8bfaeaebb9a | |
| parent | 489dbf379b9844508be9c8ff369a7ca5b9b672fe (diff) | |
| parent | b46ec3704b60bebdd63a597c62f3f471ee0d9be9 (diff) | |
Merge b46ec370 (automated)
| -rwxr-xr-x | pkg/sentry/platform/ring0/defs_impl.go | 2 | ||||
| -rw-r--r-- | runsc/sandbox/sandbox.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl.go b/pkg/sentry/platform/ring0/defs_impl.go index d4bfc5a4a..ea3f514cd 100755 --- a/pkg/sentry/platform/ring0/defs_impl.go +++ b/pkg/sentry/platform/ring0/defs_impl.go @@ -1,10 +1,10 @@ package ring0 import ( + "gvisor.dev/gvisor/pkg/cpuid" "syscall" "fmt" - "gvisor.dev/gvisor/pkg/cpuid" "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables" "gvisor.dev/gvisor/pkg/sentry/usermem" "io" diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 00b0bf659..54ed7f990 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -117,7 +117,7 @@ func New(conf *boot.Config, args *Args) (*Sandbox, error) { // occurs. Any errors occurring during cleanup itself are ignored. c := specutils.MakeCleanup(func() { err := s.destroy() - log.Warningf("error Ndestroying sandbox: %v", err) + log.Warningf("error destroying sandbox: %v", err) }) defer c.Clean() |