Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion containerd/containerd.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"syscall"
"time"

"github.com/codegangsta/cli"
"github.com/golang/glog"
"github.com/hyperhq/runv/containerd/api/grpc/server"
"github.com/hyperhq/runv/containerd/api/grpc/types"
Expand All @@ -22,6 +21,7 @@ import (
"github.com/hyperhq/runv/hypervisor"
"github.com/hyperhq/runv/supervisor"
templatecore "github.com/hyperhq/runv/template"
"github.com/urfave/cli"
"google.golang.org/grpc"
"google.golang.org/grpc/health"
"google.golang.org/grpc/health/grpc_health_v1"
Expand Down
2 changes: 1 addition & 1 deletion create.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"syscall"
"time"

"github.com/codegangsta/cli"
"github.com/hyperhq/runv/containerd/api/grpc/types"
"github.com/kardianos/osext"
"github.com/kr/pty"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
netcontext "golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strconv"
"strings"

"github.com/codegangsta/cli"
"github.com/hyperhq/runv/containerd/api/grpc/types"
"github.com/hyperhq/runv/lib/term"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
netcontext "golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion kill.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"syscall"

"github.com/codegangsta/cli"
"github.com/hyperhq/runv/containerd/api/grpc/types"
"github.com/hyperhq/runv/lib/linuxsignal"
"github.com/urfave/cli"
netcontext "golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion list.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"text/tabwriter"
"time"

"github.com/codegangsta/cli"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
)

const formatOptions = `table or json`
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"os"
"time"

"github.com/codegangsta/cli"
"github.com/docker/docker/pkg/reexec"
"github.com/golang/protobuf/ptypes"
"github.com/hyperhq/runv/containerd"
"github.com/hyperhq/runv/containerd/api/grpc/types"
_ "github.com/hyperhq/runv/supervisor/proxy" // for proxy.init()
"github.com/urfave/cli"
netcontext "golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/grpclog"
Expand Down
2 changes: 1 addition & 1 deletion manage.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"path/filepath"
"syscall"

"github.com/codegangsta/cli"
"github.com/golang/glog"
"github.com/hyperhq/runv/driverloader"
"github.com/hyperhq/runv/hypervisor"
templatecore "github.com/hyperhq/runv/template"
"github.com/urfave/cli"
)

var manageSubCmds = []cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion run.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/codegangsta/cli"
"github.com/urfave/cli"
)

var runCommand = cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion shim.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"path/filepath"
"syscall"

"github.com/codegangsta/cli"
"github.com/golang/glog"
"github.com/hyperhq/runv/containerd/api/grpc/types"
"github.com/hyperhq/runv/lib/term"
"github.com/urfave/cli"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion spec.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"runtime"

"github.com/codegangsta/cli"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
)

var specCommand = cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion start.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os"
"path/filepath"

"github.com/codegangsta/cli"
"github.com/hyperhq/runv/containerd/api/grpc/types"
"github.com/hyperhq/runv/lib/term"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
netcontext "golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion state.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"time"

"github.com/codegangsta/cli"
"github.com/urfave/cli"
)

// cState represents the platform agnostic pieces relating to a running
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.