Internal change.

PiperOrigin-RevId: 223231273
Change-Id: I8fb97ea91f7507b4918f7ce6562890611513fc30

20 files changed, 20 insertions, 16 deletions

diff --git a/runsc/cmd/boot.go b/runsc/cmd/boot.go
index 7c14857ba..5f5dca109 100644
--- a/runsc/cmd/boot.go
+++ b/runsc/cmd/boot.go
@@ -15,12 +15,12 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"runtime/debug"
 	"strings"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/runsc/cmd/checkpoint.go b/runsc/cmd/checkpoint.go
index d49d0169b..4f4771da2 100644
--- a/runsc/cmd/checkpoint.go
+++ b/runsc/cmd/checkpoint.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/pkg/log"
diff --git a/runsc/cmd/create.go b/runsc/cmd/create.go
index b84185b43..d187b8592 100644
--- a/runsc/cmd/create.go
+++ b/runsc/cmd/create.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"context"
+
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/debug.go b/runsc/cmd/debug.go
index 288cbe435..de530c068 100644
--- a/runsc/cmd/debug.go
+++ b/runsc/cmd/debug.go
@@ -15,9 +15,9 @@
 package cmd
 
 import (
+	"context"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/pkg/log"
diff --git a/runsc/cmd/delete.go b/runsc/cmd/delete.go
index ea1ca1278..8c7c7a5cd 100644
--- a/runsc/cmd/delete.go
+++ b/runsc/cmd/delete.go
@@ -15,10 +15,10 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/pkg/log"
diff --git a/runsc/cmd/events.go b/runsc/cmd/events.go
index df03415ec..a54856fb4 100644
--- a/runsc/cmd/events.go
+++ b/runsc/cmd/events.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 	"time"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/pkg/log"
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go
index 35aa5499e..548207222 100644
--- a/runsc/cmd/exec.go
+++ b/runsc/cmd/exec.go
@@ -15,6 +15,7 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -26,7 +27,6 @@ import (
 	"syscall"
 	"time"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go
index 4ec3dba9c..7276f3f26 100644
--- a/runsc/cmd/gofer.go
+++ b/runsc/cmd/gofer.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"sync"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/runsc/cmd/kill.go b/runsc/cmd/kill.go
index 1f1086250..7d86bb043 100644
--- a/runsc/cmd/kill.go
+++ b/runsc/cmd/kill.go
@@ -15,12 +15,12 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"strings"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"golang.org/x/sys/unix"
diff --git a/runsc/cmd/list.go b/runsc/cmd/list.go
index fd59b73e6..acefcb2db 100644
--- a/runsc/cmd/list.go
+++ b/runsc/cmd/list.go
@@ -15,13 +15,13 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
 	"text/tabwriter"
 	"time"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/runsc/cmd/pause.go b/runsc/cmd/pause.go
index 5ff6f059c..ee608faba 100644
--- a/runsc/cmd/pause.go
+++ b/runsc/cmd/pause.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"context"
+
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/restore.go b/runsc/cmd/restore.go
index cc99b3503..64b302b0c 100644
--- a/runsc/cmd/restore.go
+++ b/runsc/cmd/restore.go
@@ -15,10 +15,10 @@
 package cmd
 
 import (
+	"context"
 	"path/filepath"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/resume.go b/runsc/cmd/resume.go
index 274b5d084..e684aeb5c 100644
--- a/runsc/cmd/resume.go
+++ b/runsc/cmd/resume.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"context"
+
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/run.go b/runsc/cmd/run.go
index b6a12f5d6..9a574679f 100644
--- a/runsc/cmd/run.go
+++ b/runsc/cmd/run.go
@@ -15,9 +15,9 @@
 package cmd
 
 import (
+	"context"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/spec.go b/runsc/cmd/spec.go
index 57ee37c86..ee306bfa6 100644
--- a/runsc/cmd/spec.go
+++ b/runsc/cmd/spec.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 )
diff --git a/runsc/cmd/start.go b/runsc/cmd/start.go
index 48bd4c401..065efec06 100644
--- a/runsc/cmd/start.go
+++ b/runsc/cmd/start.go
@@ -16,6 +16,7 @@ package cmd
 
 import (
 	"context"
+
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/cmd/state.go b/runsc/cmd/state.go
index f8ce8c3d8..15e27b250 100644
--- a/runsc/cmd/state.go
+++ b/runsc/cmd/state.go
@@ -15,10 +15,10 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/pkg/log"
diff --git a/runsc/cmd/wait.go b/runsc/cmd/wait.go
index 121c54554..1e1c1fe17 100644
--- a/runsc/cmd/wait.go
+++ b/runsc/cmd/wait.go
@@ -15,11 +15,11 @@
 package cmd
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 	"syscall"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 	"gvisor.googlesource.com/gvisor/runsc/boot"
diff --git a/runsc/main.go b/runsc/main.go
index c0ee04216..81c36067b 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -17,13 +17,13 @@
 package main
 
 import (
+	"context"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 	"syscall"
 
-	"context"
 	"flag"
 
 	"github.com/google/subcommands"
diff --git a/runsc/tools/dockercfg/dockercfg.go b/runsc/tools/dockercfg/dockercfg.go
index 110a581ff..cc7a67816 100644
--- a/runsc/tools/dockercfg/dockercfg.go
+++ b/runsc/tools/dockercfg/dockercfg.go
@@ -16,13 +16,13 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"log"
 	"os"
 
-	"context"
 	"flag"
 	"github.com/google/subcommands"
 )