Skip to content

Commit c9ea816

Browse files
estespestesp
authored
Merge pull request #2351 from crosbymichael/pkg
Move top level packages into pkg or specific sub pkgs
2 parents d1435e6 + 8e97da0 commit c9ea816

52 files changed

Lines changed: 30 additions & 102 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎archive/issues_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"testing"
2727

2828
"github.com/containerd/containerd/archive/compression"
29-
"github.com/containerd/containerd/testutil"
29+
"github.com/containerd/containerd/pkg/testutil"
3030
)
3131

3232
// TestPrefixHeaderReadable tests that files that could be created with the

‎client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ import (
3939
"github.com/containerd/containerd/containers"
4040
"github.com/containerd/containerd/content"
4141
"github.com/containerd/containerd/defaults"
42-
"github.com/containerd/containerd/dialer"
4342
"github.com/containerd/containerd/errdefs"
4443
"github.com/containerd/containerd/events"
4544
"github.com/containerd/containerd/images"
4645
"github.com/containerd/containerd/namespaces"
46+
"github.com/containerd/containerd/pkg/dialer"
4747
"github.com/containerd/containerd/plugin"
4848
"github.com/containerd/containerd/remotes"
4949
"github.com/containerd/containerd/remotes/docker"

‎client_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"github.com/containerd/containerd/images"
3434
"github.com/containerd/containerd/log"
3535
"github.com/containerd/containerd/namespaces"
36+
"github.com/containerd/containerd/pkg/testutil"
3637
"github.com/containerd/containerd/platforms"
3738
"github.com/containerd/containerd/sys"
38-
"github.com/containerd/containerd/testutil"
3939
"github.com/sirupsen/logrus"
4040
)
4141

‎cmd/containerd/builtins.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package main
2020
import (
2121
_ "github.com/containerd/containerd/diff/walking/plugin"
2222
_ "github.com/containerd/containerd/gc/scheduler"
23-
_ "github.com/containerd/containerd/restart/monitor"
23+
_ "github.com/containerd/containerd/runtime/restart/monitor"
2424
_ "github.com/containerd/containerd/services/containers"
2525
_ "github.com/containerd/containerd/services/content"
2626
_ "github.com/containerd/containerd/services/diff"

‎cmd/containerd/command/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"os"
2222

2323
"github.com/BurntSushi/toml"
24-
"github.com/containerd/containerd/server"
24+
"github.com/containerd/containerd/services/server"
2525
"github.com/urfave/cli"
2626
)
2727

‎cmd/containerd/command/config_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/server"
21+
"github.com/containerd/containerd/services/server"
2222
)
2323

2424
func defaultConfig() *server.Config {

‎cmd/containerd/command/config_unsupported.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package command
2020

2121
import (
2222
"github.com/containerd/containerd/defaults"
23-
"github.com/containerd/containerd/server"
23+
"github.com/containerd/containerd/services/server"
2424
)
2525

2626
func defaultConfig() *server.Config {

‎cmd/containerd/command/config_windows.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package command
1818

1919
import (
2020
"github.com/containerd/containerd/defaults"
21-
"github.com/containerd/containerd/server"
21+
"github.com/containerd/containerd/services/server"
2222
)
2323

2424
func defaultConfig() *server.Config {

‎cmd/containerd/command/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
"github.com/containerd/containerd/log"
3131
"github.com/containerd/containerd/mount"
32-
"github.com/containerd/containerd/server"
32+
"github.com/containerd/containerd/services/server"
3333
"github.com/containerd/containerd/sys"
3434
"github.com/containerd/containerd/version"
3535
"github.com/pkg/errors"

‎cmd/containerd/command/main_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"runtime"
2525

2626
"github.com/containerd/containerd/log"
27-
"github.com/containerd/containerd/server"
27+
"github.com/containerd/containerd/services/server"
2828
"github.com/sirupsen/logrus"
2929
"golang.org/x/sys/unix"
3030
)

0 commit comments

Comments
 (0)