Skip to content

Commit af38515

Browse files
crosbymichaelcrosbymichael
committed
Move execdrivers into runtime top level pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
1 parent 2230c9b commit af38515

21 files changed

+18
-18
lines changed

‎runtime/container.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"github.com/dotcloud/docker/archive"
88
"github.com/dotcloud/docker/engine"
9-
"github.com/dotcloud/docker/execdriver"
9+
"github.com/dotcloud/docker/runtime/execdriver"
1010
"github.com/dotcloud/docker/graphdriver"
1111
"github.com/dotcloud/docker/image"
1212
"github.com/dotcloud/docker/links"

execdriver/MAINTAINERS renamed to runtime/execdriver/MAINTAINERS

File renamed without changes.

execdriver/driver.go renamed to runtime/execdriver/driver.go

File renamed without changes.

execdriver/execdrivers/execdrivers.go renamed to runtime/execdriver/execdrivers/execdrivers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package execdrivers
22

33
import (
44
"fmt"
5-
"github.com/dotcloud/docker/execdriver"
6-
"github.com/dotcloud/docker/execdriver/lxc"
7-
"github.com/dotcloud/docker/execdriver/native"
5+
"github.com/dotcloud/docker/runtime/execdriver"
6+
"github.com/dotcloud/docker/runtime/execdriver/lxc"
7+
"github.com/dotcloud/docker/runtime/execdriver/native"
88
"github.com/dotcloud/docker/pkg/sysinfo"
99
"path"
1010
)

execdriver/lxc/driver.go renamed to runtime/execdriver/lxc/driver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package lxc
22

33
import (
44
"fmt"
5-
"github.com/dotcloud/docker/execdriver"
5+
"github.com/dotcloud/docker/runtime/execdriver"
66
"github.com/dotcloud/docker/pkg/cgroups"
77
"github.com/dotcloud/docker/utils"
88
"io/ioutil"

execdriver/lxc/info.go renamed to runtime/execdriver/lxc/info.go

File renamed without changes.

execdriver/lxc/info_test.go renamed to runtime/execdriver/lxc/info_test.go

File renamed without changes.

execdriver/lxc/init.go renamed to runtime/execdriver/lxc/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package lxc
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/dotcloud/docker/execdriver"
6+
"github.com/dotcloud/docker/runtime/execdriver"
77
"github.com/dotcloud/docker/pkg/netlink"
88
"github.com/dotcloud/docker/pkg/user"
99
"github.com/syndtr/gocapability/capability"

execdriver/lxc/lxc_init_linux.go renamed to runtime/execdriver/lxc/lxc_init_linux.go

File renamed without changes.

execdriver/lxc/lxc_init_unsupported.go renamed to runtime/execdriver/lxc/lxc_init_unsupported.go

File renamed without changes.

0 commit comments

Comments
 (0)