containerd
diff --git a/‎cmd/containerd/command/config.go
+1-1 b/‎cmd/containerd/command/config.go
+1-1
diff --git a/‎cmd/containerd/command/config_linux.go
+1-1 b/‎cmd/containerd/command/config_linux.go
+1-1
diff --git a/‎cmd/containerd/command/config_unsupported.go
+1-1 b/‎cmd/containerd/command/config_unsupported.go
+1-1
diff --git a/‎cmd/containerd/command/config_windows.go
+1-1 b/‎cmd/containerd/command/config_windows.go
+1-1
diff --git a/‎cmd/containerd/command/main.go
+1-1 b/‎cmd/containerd/command/main.go
+1-1
diff --git a/‎cmd/containerd/command/main_unix.go
+1-1 b/‎cmd/containerd/command/main_unix.go
+1-1
diff --git a/‎cmd/containerd/command/main_windows.go
+1-1 b/‎cmd/containerd/command/main_windows.go
+1-1
diff --git a/‎daemon_config_linux_test.go
+1-1 b/‎daemon_config_linux_test.go
+1-1
diff --git a/‎server/config.go ‎services/server/config.go b/‎server/config.go ‎services/server/config.go
diff --git a/‎server/server.go ‎services/server/server.go b/‎server/server.go ‎services/server/server.go
diff --git a/‎server/server_linux.go ‎services/server/server_linux.go b/‎server/server_linux.go ‎services/server/server_linux.go
diff --git a/‎server/server_solaris.go ‎services/server/server_solaris.go b/‎server/server_solaris.go ‎services/server/server_solaris.go
diff --git a/‎server/server_test.go ‎services/server/server_test.go b/‎server/server_test.go ‎services/server/server_test.go
diff --git a/‎server/server_unsupported.go ‎services/server/server_unsupported.go b/‎server/server_unsupported.go ‎services/server/server_unsupported.go
diff --git a/‎server/server_windows.go ‎services/server/server_windows.go b/‎server/server_windows.go ‎services/server/server_windows.go
@@ -21,7 +21,7 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/urfave/cli"
 )
 
 
@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
 
@@ -20,7 +20,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
 
@@ -18,7 +18,7 @@ package command
 
 import (
 	"github.com/containerd/containerd/defaults"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 func defaultConfig() *server.Config {
 
@@ -29,7 +29,7 @@ import (
 
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/mount"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/containerd/containerd/sys"
 	"github.com/containerd/containerd/version"
 	"github.com/pkg/errors"
 
@@ -24,7 +24,7 @@ import (
 	"runtime"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
 
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/containerd/containerd/log"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 
 	"golang.org/x/sys/windows"
 )
 
@@ -30,7 +30,7 @@ import (
 
 	"github.com/containerd/containerd/oci"
 	"github.com/containerd/containerd/pkg/testutil"
-	"github.com/containerd/containerd/server"
+	"github.com/containerd/containerd/services/server"
 )
 
 // the following nolint is for shutting up gometalinter on non-linux.
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"os"`
`22`	`22`
`23`	`23`	`"github.com/BurntSushi/toml"`
`24`		`- "github.com/containerd/containerd/server"`
	`24`	`+ "github.com/containerd/containerd/services/server"`
`25`	`25`	`"github.com/urfave/cli"`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package command`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"github.com/containerd/containerd/defaults"`
`21`		`- "github.com/containerd/containerd/server"`
	`21`	`+ "github.com/containerd/containerd/services/server"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func defaultConfig() *server.Config {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ package command`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"github.com/containerd/containerd/defaults"`
`23`		`- "github.com/containerd/containerd/server"`
	`23`	`+ "github.com/containerd/containerd/services/server"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`func defaultConfig() *server.Config {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"runtime"`
`25`	`25`
`26`	`26`	`"github.com/containerd/containerd/log"`
`27`		`- "github.com/containerd/containerd/server"`
	`27`	`+ "github.com/containerd/containerd/services/server"`
`28`	`28`	`"github.com/sirupsen/logrus"`
`29`	`29`	`"golang.org/x/sys/unix"`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"path/filepath"`
`23`	`23`
`24`	`24`	`"github.com/containerd/containerd/log"`
`25`		`- "github.com/containerd/containerd/server"`
	`25`	`+ "github.com/containerd/containerd/services/server"`
`26`	`26`
`27`	`27`	`"golang.org/x/sys/windows"`
`28`	`28`	`)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`
`31`	`31`	`"github.com/containerd/containerd/oci"`
`32`	`32`	`"github.com/containerd/containerd/pkg/testutil"`
`33`		`- "github.com/containerd/containerd/server"`
	`33`	`+ "github.com/containerd/containerd/services/server"`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`// the following nolint is for shutting up gometalinter on non-linux.`