0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mass gofmt

Browse source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
This commit is contained in:
Alexandr Morozov 2014-10-24 15:11:48 -07:00
parent b99dcb3c7e
commit ee7dd44c01
32 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/attach.go
View file

@ -6,10 +6,10 @@ import (
"os"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonlog"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/promise"
"github.com/docker/docker/utils"
)

2
daemon/container.go
View file

@ -17,6 +17,7 @@ import (
"github.com/docker/libcontainer/devices"
"github.com/docker/libcontainer/label"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
@ -25,7 +26,6 @@ import (
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/broadcastwriter"
"github.com/docker/docker/pkg/ioutils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/networkfs/etchosts"
"github.com/docker/docker/pkg/networkfs/resolvconf"
"github.com/docker/docker/pkg/promise"

2
daemon/daemon_aufs.go
View file

@ -3,10 +3,10 @@
package daemon
import (
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/daemon/graphdriver/aufs"
"github.com/docker/docker/graph"
log "github.com/Sirupsen/logrus"
)
// Given the graphdriver ad, if it is aufs, then migrate it.

2
daemon/delete.go
View file

@ -5,8 +5,8 @@ import (
"os"
"path"
"github.com/docker/docker/engine"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
)
func (daemon *Daemon) ContainerRm(job *engine.Job) engine.Status {

2
daemon/exec.go
View file

@ -9,12 +9,12 @@ import (
"strings"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/execdriver/lxc"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/broadcastwriter"
"github.com/docker/docker/pkg/ioutils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/promise"
"github.com/docker/docker/runconfig"
"github.com/docker/docker/utils"

2
daemon/execdriver/lxc/driver.go
View file

@ -17,8 +17,8 @@ import (
"github.com/kr/pty"
"github.com/docker/docker/daemon/execdriver"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/pkg/term"
"github.com/docker/docker/utils"
"github.com/docker/libcontainer/cgroups"

2
daemon/graphdriver/aufs/aufs.go
View file

@ -30,9 +30,9 @@ import (
"sync"
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
mountpk "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/utils"
"github.com/docker/libcontainer/label"

2
daemon/graphdriver/devmapper/deviceset.go
View file

@ -18,8 +18,8 @@ import (
"syscall"
"time"
"github.com/docker/docker/daemon/graphdriver"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/parsers"
"github.com/docker/docker/pkg/units"
"github.com/docker/libcontainer/label"

2
daemon/graphdriver/devmapper/driver.go
View file

@ -8,8 +8,8 @@ import (
"os"
"path"
"github.com/docker/docker/daemon/graphdriver"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/units"
)

2
daemon/graphdriver/fsdiff.go
View file

@ -4,9 +4,9 @@ import (
"fmt"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/ioutils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/utils"
)

2
daemon/info.go
View file

@ -4,9 +4,9 @@ import (
"os"
"runtime"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/engine"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/parsers/operatingsystem"
"github.com/docker/docker/registry"

2
daemon/logs.go
View file

@ -8,9 +8,9 @@ import (
"os"
"strconv"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/jsonlog"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/tailfile"
"github.com/docker/docker/pkg/timeutils"
)

2
daemon/monitor.go
View file

@ -6,8 +6,8 @@ import (
"sync"
"time"
"github.com/docker/docker/daemon/execdriver"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/runconfig"
)

2
daemon/networkdriver/bridge/driver.go
View file

@ -8,13 +8,13 @@ import (
"strings"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/networkdriver"
"github.com/docker/docker/daemon/networkdriver/ipallocator"
"github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/docker/docker/daemon/networkdriver/portmapper"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/iptables"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/networkfs/resolvconf"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/libcontainer/netlink"

2
daemon/networkdriver/portmapper/mapper.go
View file

@ -6,9 +6,9 @@ import (
"net"
"sync"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/networkdriver/portallocator"
"github.com/docker/docker/pkg/iptables"
log "github.com/Sirupsen/logrus"
)
type mapping struct {

2
daemon/volumes.go
View file

@ -10,9 +10,9 @@ import (
"strings"
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/symlink"
"github.com/docker/docker/volumes"
)

2
graph/export.go
View file

@ -7,9 +7,9 @@ import (
"os"
"path"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers"
)

2
graph/graph.go
View file

@ -12,11 +12,11 @@ import (
"syscall"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/image"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/truncindex"
"github.com/docker/docker/runconfig"
"github.com/docker/docker/utils"

2
graph/load.go
View file

@ -7,10 +7,10 @@ import (
"os"
"path"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
)
// Loads a set of images into the repository. This is the complementary of ImageExport.

2
graph/pull.go
View file

@ -12,9 +12,9 @@ import (
"strings"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/registry"
"github.com/docker/docker/utils"
"github.com/docker/libtrust"

2
graph/push.go
View file

@ -7,9 +7,9 @@ import (
"os"
"path"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/registry"
"github.com/docker/docker/utils"
)

2
graph/service.go
View file

@ -4,9 +4,9 @@ import (
"fmt"
"io"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
log "github.com/Sirupsen/logrus"
)
func (s *TagStore) Install(eng *engine.Engine) error {

2
image/image.go
View file

@ -9,8 +9,8 @@ import (
"strconv"
"time"
"github.com/docker/docker/pkg/archive"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/runconfig"
"github.com/docker/docker/utils"
)

2
integration/commands_test.go
View file

@ -9,9 +9,9 @@ import (
"testing"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/api/client"
"github.com/docker/docker/daemon"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/term"
"github.com/docker/docker/utils"
"github.com/docker/libtrust"

2
integration/runtime_test.go
View file

@ -16,12 +16,12 @@ import (
"testing"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
"github.com/docker/docker/nat"
"github.com/docker/docker/pkg/ioutils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/reexec"
"github.com/docker/docker/runconfig"
"github.com/docker/docker/utils"

2
pkg/archive/archive.go
View file

@ -18,8 +18,8 @@ import (
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
"github.com/docker/docker/pkg/fileutils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/pools"
"github.com/docker/docker/pkg/promise"
"github.com/docker/docker/pkg/system"

2
pkg/broadcastwriter/broadcastwriter.go
View file

@ -6,8 +6,8 @@ import (
"sync"
"time"
"github.com/docker/docker/pkg/jsonlog"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/jsonlog"
)
// BroadcastWriter accumulate multiple io.WriteCloser by stream.

2
registry/session.go
View file

@ -17,8 +17,8 @@ import (
"strings"
"time"
"github.com/docker/docker/pkg/httputils"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/httputils"
"github.com/docker/docker/pkg/tarsum"
"github.com/docker/docker/utils"
)

2
runconfig/merge.go
View file

@ -3,8 +3,8 @@ package runconfig
import (
"strings"
"github.com/docker/docker/nat"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/nat"
)
func Merge(userConf, imageConf *Config) error {

2
trust/service.go
View file

@ -4,8 +4,8 @@ import (
"fmt"
"time"
"github.com/docker/docker/engine"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/libtrust"
)

2
utils/utils.go
View file

@ -20,10 +20,10 @@ import (
"sync"
"syscall"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/fileutils"
"github.com/docker/docker/pkg/ioutils"
log "github.com/Sirupsen/logrus"
)
type KeyValuePair struct {

2
volumes/repository.go
View file

@ -7,8 +7,8 @@ import (
"path/filepath"
"sync"
"github.com/docker/docker/daemon/graphdriver"
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/utils"
)