diff options
| author | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
|---|---|---|
| committer | Ian Lewis <ianmlewis@gmail.com> | 2020-08-17 21:44:31 -0400 |
| commit | ac324f646ee3cb7955b0b45a7453aeb9671cbdf1 (patch) | |
| tree | 0cbc5018e8807421d701d190dc20525726c7ca76 /runsc/cmd/exec.go | |
| parent | 352ae1022ce19de28fc72e034cc469872ad79d06 (diff) | |
| parent | 6d0c5803d557d453f15ac6f683697eeb46dab680 (diff) | |
Merge branch 'master' into ip-forwarding
- Merges aleksej-paschenko's with HEAD
- Adds vfs2 support for ip_forward
Diffstat (limited to 'runsc/cmd/exec.go')
| -rw-r--r-- | runsc/cmd/exec.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go index d1e99243b..d9a94903e 100644 --- a/runsc/cmd/exec.go +++ b/runsc/cmd/exec.go @@ -27,7 +27,6 @@ import ( "syscall" "time" - "flag" "github.com/google/subcommands" specs "github.com/opencontainers/runtime-spec/specs-go" "gvisor.dev/gvisor/pkg/log" @@ -37,6 +36,7 @@ import ( "gvisor.dev/gvisor/runsc/boot" "gvisor.dev/gvisor/runsc/console" "gvisor.dev/gvisor/runsc/container" + "gvisor.dev/gvisor/runsc/flag" "gvisor.dev/gvisor/runsc/specutils" ) |