docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity

Merge pull request #3681 from pnasrat/extract-cgroups-pkg

Browse Source 
Extract cgroups into pkg sub dir
Upstream-commit: fbd374f30b11a39ea24a7f3fddb6a50329e4ddd7
Component: engine
This commit is contained in:
Michael Crosby
2014-01-20 14:00:44 -08:00
parent 28e9f7be0b c8d1294225
commit bcfdc65951
9 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/container.go
View File

@@ -5,9 +5,9 @@ import (
"errors"
"fmt"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/cgroups"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/mount"
"github.com/dotcloud/docker/pkg/term"
"github.com/dotcloud/docker/utils"

2
components/engine/execdriver/driver.go
View File

@@ -2,7 +2,7 @@ package execdriver
import (
"errors"
"github.com/dotcloud/docker/cgroups"
"github.com/dotcloud/docker/pkg/cgroups"
"os/exec"
"syscall"
)

2
components/engine/execdriver/lxc/lxc_template.go
View File

@@ -1,7 +1,7 @@
package lxc
import (
"github.com/dotcloud/docker/cgroups"
"github.com/dotcloud/docker/pkg/cgroups"
"strings"
"text/template"
)

2
components/engine/execdriver/lxc/lxc_template_unit_test.go
View File

@@ -3,8 +3,8 @@ package lxc
import (
"bufio"
"fmt"
"github.com/dotcloud/docker/cgroups"
"github.com/dotcloud/docker/execdriver"
"github.com/dotcloud/docker/pkg/cgroups"
"io/ioutil"
"math/rand"
"os"

0
components/engine/cgroups/MAINTAINERS → components/engine/pkg/cgroups/MAINTAINERS
View File

0
components/engine/cgroups/cgroups.go → components/engine/pkg/cgroups/cgroups.go
View File

0
components/engine/cgroups/cgroups_test.go → components/engine/pkg/cgroups/cgroups_test.go
View File

2
components/engine/pkg/sysinfo/sysinfo.go
View File

@@ -1,7 +1,7 @@
package sysinfo
import (
"github.com/dotcloud/docker/cgroups" // FIXME: move cgroups in pkg
"github.com/dotcloud/docker/pkg/cgroups"
"io/ioutil"
"log"
"os"

2
components/engine/server.go
View File

@@ -6,8 +6,8 @@ import (
"fmt"
"github.com/dotcloud/docker/archive"
"github.com/dotcloud/docker/auth"
"github.com/dotcloud/docker/cgroups"
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker/pkg/cgroups"
"github.com/dotcloud/docker/pkg/graphdb"
"github.com/dotcloud/docker/registry"
"github.com/dotcloud/docker/utils"