فهرست منبع

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

Extract cgroups into pkg sub dir
Michael Crosby 11 سال پیش
والد
کامیت
fbd374f30b

+ 1 - 1
container.go

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

+ 1 - 1
execdriver/driver.go

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

+ 1 - 1
execdriver/lxc/lxc_template.go

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

+ 1 - 1
execdriver/lxc/lxc_template_unit_test.go

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

+ 0 - 0
cgroups/MAINTAINERS → pkg/cgroups/MAINTAINERS


+ 0 - 0
cgroups/cgroups.go → pkg/cgroups/cgroups.go


+ 0 - 0
cgroups/cgroups_test.go → pkg/cgroups/cgroups_test.go


+ 1 - 1
pkg/sysinfo/sysinfo.go

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

+ 1 - 1
server.go

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