Move oci and shim to execution package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-12-01 11:06:32 -08:00 · 2016-12-01 11:06:32 -08:00 · fdbae36237
commit fdbae36237
parent c2a57e2b00
25 changed files with 1 additions and 1 deletions
--- a/execution/oci/oci.go
+++ b/execution/oci/oci.go
--- a/execution/oci/process.go
+++ b/execution/oci/process.go
--- a/execution/shim/containerd-shim/console.go
+++ b/execution/shim/containerd-shim/console.go
--- a/execution/shim/containerd-shim/console_solaris.go
+++ b/execution/shim/containerd-shim/console_solaris.go
--- a/execution/shim/containerd-shim/example/config.json
+++ b/execution/shim/containerd-shim/example/config.json
--- a/execution/shim/containerd-shim/example/init/exit
+++ b/execution/shim/containerd-shim/example/init/exit
--- a/execution/shim/containerd-shim/example/init/pid
+++ b/execution/shim/containerd-shim/example/init/pid
--- a/execution/shim/containerd-shim/example/init/process.json
+++ b/execution/shim/containerd-shim/example/init/process.json
--- a/execution/shim/containerd-shim/example/init/resize
+++ b/execution/shim/containerd-shim/example/init/resize
--- a/execution/shim/containerd-shim/example/init/stderr
+++ b/execution/shim/containerd-shim/example/init/stderr
--- a/execution/shim/containerd-shim/example/init/stdin
+++ b/execution/shim/containerd-shim/example/init/stdin
--- a/execution/shim/containerd-shim/example/init/stdout
+++ b/execution/shim/containerd-shim/example/init/stdout
--- a/execution/shim/containerd-shim/example/logger/exit
+++ b/execution/shim/containerd-shim/example/logger/exit
--- a/execution/shim/containerd-shim/example/logger/pid
+++ b/execution/shim/containerd-shim/example/logger/pid
--- a/execution/shim/containerd-shim/example/logger/process.json
+++ b/execution/shim/containerd-shim/example/logger/process.json
--- a/execution/shim/containerd-shim/example/logger/resize
+++ b/execution/shim/containerd-shim/example/logger/resize
--- a/execution/shim/containerd-shim/example/logger/stderr
+++ b/execution/shim/containerd-shim/example/logger/stderr
--- a/execution/shim/containerd-shim/example/logger/stdin
+++ b/execution/shim/containerd-shim/example/logger/stdin
--- a/execution/shim/containerd-shim/example/logger/stdout
+++ b/execution/shim/containerd-shim/example/logger/stdout
--- a/execution/shim/containerd-shim/main.go
+++ b/execution/shim/containerd-shim/main.go
--- a/execution/shim/containerd-shim/process.go
+++ b/execution/shim/containerd-shim/process.go
--- a/execution/shim/containerd-shim/process_pdeathsig.go
+++ b/execution/shim/containerd-shim/process_pdeathsig.go
--- a/execution/shim/containerd-shim/process_pdeathsig_unsupported.go
+++ b/execution/shim/containerd-shim/process_pdeathsig_unsupported.go
--- a/execution/shim/process.go
+++ b/execution/shim/process.go
--- a/execution/shim/shim.go
+++ b/execution/shim/shim.go
@ -13,8 +13,8 @@ import (
 	"time"

 	"github.com/docker/containerd"
+	"github.com/docker/containerd/execution/oci"
 	"github.com/docker/containerd/monitor"
-	"github.com/docker/containerd/oci"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )