Skip to content
This repository has been archived by the owner on Dec 13, 2018. It is now read-only.

Commit

Permalink
Update imports for new repository path
Browse files Browse the repository at this point in the history
  • Loading branch information
@crosbymichael
crosbymichael committed Jun 10, 2014
1 parent c1bcd38 commit 6ab3ef5
Show file tree
Hide file tree
Showing 42 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion cgroups/cgroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cgroups
import (
"errors"

"github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/docker/libcontainer/devices"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/apply_raw.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strconv"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/blkio.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"strings"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type blkioGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/blkio_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package fs
import (
"testing"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/cpu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type cpuGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/cpu_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

func TestCpuStats(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/cpuacct.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"time"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/cpuset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strconv"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type cpusetGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/devices.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fs

import "github.com/dotcloud/docker/pkg/libcontainer/cgroups"
import "github.com/docker/libcontainer/cgroups"

type devicesGroup struct {
}
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/freezer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type freezerGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"
"strconv"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type memoryGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/memory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package fs
import (
"testing"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/perf_event.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fs

import (
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

type perfEventGroup struct {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/fs/stats_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"testing"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

func blkioStatEntryEquals(expected, actual []cgroups.BlkioStatEntry) error {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/systemd/apply_nosystemd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package systemd
import (
"fmt"

"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
)

func UseSystemd() bool {
Expand Down
2 changes: 1 addition & 1 deletion cgroups/systemd/apply_systemd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"time"

systemd1 "github.com/coreos/go-systemd/dbus"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/systemd"
"github.com/godbus/dbus"
)
Expand Down
2 changes: 1 addition & 1 deletion console/console.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
4 changes: 2 additions & 2 deletions container.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package libcontainer

import (
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/devices"
)

// Context is a generic key value pair that allows arbatrary data to be sent
Expand Down
2 changes: 1 addition & 1 deletion label/label_selinux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strings"

"github.com/dotcloud/docker/pkg/libcontainer/selinux"
"github.com/docker/libcontainer/selinux"
)

func GenLabels(options string) (string, string, error) {
Expand Down
6 changes: 3 additions & 3 deletions mount/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"path/filepath"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer/mount/nodes"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/label"
"github.com/docker/libcontainer/mount/nodes"
"github.com/dotcloud/docker/pkg/symlink"
"github.com/dotcloud/docker/pkg/system"
)
Expand Down
2 changes: 1 addition & 1 deletion mount/nodes/nodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/docker/libcontainer/devices"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
4 changes: 2 additions & 2 deletions mount/nodes/nodes_unsupported.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package nodes

import (
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/devices"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/devices"
)

func CreateDeviceNodes(rootfs string, nodesToCreate []*devices.Device) error {
Expand Down
2 changes: 1 addition & 1 deletion mount/ptmx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package mount

import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer/console"
"github.com/docker/libcontainer/console"
"os"
"path/filepath"
)
Expand Down
2 changes: 1 addition & 1 deletion namespaces/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"os/exec"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
)

type CreateCommand func(container *libcontainer.Container, console, rootfs, dataPath, init string, childPipe *os.File, args []string) *exec.Cmd
10 changes: 5 additions & 5 deletions namespaces/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"os/exec"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups"
"github.com/docker/libcontainer/cgroups/fs"
"github.com/docker/libcontainer/cgroups/systemd"
"github.com/docker/libcontainer/network"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
4 changes: 2 additions & 2 deletions namespaces/execin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"strconv"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/label"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
20 changes: 10 additions & 10 deletions namespaces/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import (
"strings"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer/console"
"github.com/dotcloud/docker/pkg/libcontainer/label"
"github.com/dotcloud/docker/pkg/libcontainer/mount"
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/libcontainer/security/capabilities"
"github.com/dotcloud/docker/pkg/libcontainer/security/restrict"
"github.com/dotcloud/docker/pkg/libcontainer/utils"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/apparmor"
"github.com/docker/libcontainer/console"
"github.com/docker/libcontainer/label"
"github.com/docker/libcontainer/mount"
"github.com/docker/libcontainer/netlink"
"github.com/docker/libcontainer/network"
"github.com/docker/libcontainer/security/capabilities"
"github.com/docker/libcontainer/security/restrict"
"github.com/docker/libcontainer/utils"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/pkg/user"
)
Expand Down
2 changes: 1 addition & 1 deletion namespaces/sync_pipe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
)

// SyncPipe allows communication to and from the child processes
Expand Down
4 changes: 2 additions & 2 deletions namespaces/unsupported.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package namespaces

import (
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups"
)

func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath string, args []string, createCommand CreateCommand, startCallback func()) (int, error) {
Expand Down
2 changes: 1 addition & 1 deletion network/loopback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package network

import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
)

// Loopback is a network strategy that provides a basic loopback device
Expand Down
2 changes: 1 addition & 1 deletion network/netns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"syscall"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
"github.com/dotcloud/docker/pkg/system"
)

Expand Down
2 changes: 1 addition & 1 deletion network/network.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package network

import (
"github.com/dotcloud/docker/pkg/libcontainer/netlink"
"github.com/docker/libcontainer/netlink"
"net"
)

Expand Down
2 changes: 1 addition & 1 deletion network/strategy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package network
import (
"errors"

"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions network/veth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package network

import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/utils"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/utils"
)

// Veth is a network strategy that uses a bridge and creates
Expand Down
4 changes: 2 additions & 2 deletions nsinit/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os/signal"

"github.com/codegangsta/cli"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/namespaces"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/namespaces"
)

var execCommand = cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion nsinit/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"

"github.com/codegangsta/cli"
"github.com/dotcloud/docker/pkg/libcontainer/namespaces"
"github.com/docker/libcontainer/namespaces"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion nsinit/nsenter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"

"github.com/codegangsta/cli"
"github.com/dotcloud/docker/pkg/libcontainer/namespaces"
"github.com/docker/libcontainer/namespaces"
)

var nsenterCommand = cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion nsinit/spec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"

"github.com/codegangsta/cli"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/docker/libcontainer"
)

var specCommand = cli.Command{
Expand Down
4 changes: 2 additions & 2 deletions nsinit/stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"log"

"github.com/codegangsta/cli"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/cgroups/fs"
)

var statsCommand = cli.Command{
Expand Down
Loading

0 comments on commit 6ab3ef5

Please sign in to comment.