1. docker
  2. Commit 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Browse code

Gofmt imports Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Michael Crosby authored on 2014/03/15 07:07:52
Showing 14 changed files
graph/graph.go
History View file @ 2bddcd6
... ... 
@@ -4,9 +4,9 @@ import (
4 4 
 	"fmt"
5 5 
 	"github.com/dotcloud/docker/archive"
6 6 
 	"github.com/dotcloud/docker/dockerversion"
7 
-	"github.com/dotcloud/docker/runtime/graphdriver"
8 7 
 	"github.com/dotcloud/docker/image"
9 8 
 	"github.com/dotcloud/docker/runconfig"
9 
+	"github.com/dotcloud/docker/runtime/graphdriver"
10 10 
 	"github.com/dotcloud/docker/utils"
11 11 
 	"io"
12 12 
 	"io/ioutil"
graph/tags_unit_test.go
History View file @ 2bddcd6
... ... 
@@ -2,9 +2,9 @@ package graph
2 2
3 3 
 import (
4 4 
 	"bytes"
5 
+	"github.com/dotcloud/docker/image"
5 6 
 	"github.com/dotcloud/docker/runtime/graphdriver"
6 7 
 	_ "github.com/dotcloud/docker/runtime/graphdriver/vfs" // import the vfs driver so it is used in the tests
7 
-	"github.com/dotcloud/docker/image"
8 8 
 	"github.com/dotcloud/docker/utils"
9 9 
 	"github.com/dotcloud/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
10 10 
 	"io"
image/image.go
History View file @ 2bddcd6
... ... 
@@ -4,8 +4,8 @@ import (
4 4 
 	"encoding/json"
5 5 
 	"fmt"
6 6 
 	"github.com/dotcloud/docker/archive"
7 
-	"github.com/dotcloud/docker/runtime/graphdriver"
8 7 
 	"github.com/dotcloud/docker/runconfig"
8 
+	"github.com/dotcloud/docker/runtime/graphdriver"
9 9 
 	"github.com/dotcloud/docker/utils"
10 10 
 	"io/ioutil"
11 11 
 	"os"
integration/graph_test.go
History View file @ 2bddcd6
... ... 
@@ -5,8 +5,8 @@ import (
5 5 
 	"github.com/dotcloud/docker/archive"
6 6 
 	"github.com/dotcloud/docker/dockerversion"
7 7 
 	"github.com/dotcloud/docker/graph"
8 
-	"github.com/dotcloud/docker/runtime/graphdriver"
9 8 
 	"github.com/dotcloud/docker/image"
9 
+	"github.com/dotcloud/docker/runtime/graphdriver"
10 10 
 	"github.com/dotcloud/docker/utils"
11 11 
 	"io"
12 12 
 	"io/ioutil"
runtime/container.go
History View file @ 2bddcd6
... ... 
@@ -6,12 +6,12 @@ import (
6 6 
 	"fmt"
7 7 
 	"github.com/dotcloud/docker/archive"
8 8 
 	"github.com/dotcloud/docker/engine"
9 
-	"github.com/dotcloud/docker/runtime/execdriver"
10 
-	"github.com/dotcloud/docker/runtime/graphdriver"
11 9 
 	"github.com/dotcloud/docker/image"
12 10 
 	"github.com/dotcloud/docker/links"
13 11 
 	"github.com/dotcloud/docker/nat"
14 12 
 	"github.com/dotcloud/docker/runconfig"
13 
+	"github.com/dotcloud/docker/runtime/execdriver"
14 
+	"github.com/dotcloud/docker/runtime/graphdriver"
15 15 
 	"github.com/dotcloud/docker/utils"
16 16 
 	"io"
17 17 
 	"io/ioutil"
runtime/execdriver/execdrivers/execdrivers.go
History View file @ 2bddcd6
... ... 
@@ -2,10 +2,10 @@ package execdrivers
2 2
3 3 
 import (
4 4 
 	"fmt"
5 
+	"github.com/dotcloud/docker/pkg/sysinfo"
5 6 
 	"github.com/dotcloud/docker/runtime/execdriver"
6 7 
 	"github.com/dotcloud/docker/runtime/execdriver/lxc"
7 8 
 	"github.com/dotcloud/docker/runtime/execdriver/native"
8 
-	"github.com/dotcloud/docker/pkg/sysinfo"
9 9 
 	"path"
10 10 
 )
11 11
runtime/execdriver/lxc/driver.go
History View file @ 2bddcd6
... ... 
@@ -2,8 +2,8 @@ package lxc
2 2
3 3 
 import (
4 4 
 	"fmt"
5 
-	"github.com/dotcloud/docker/runtime/execdriver"
6 5 
 	"github.com/dotcloud/docker/pkg/cgroups"
6 
+	"github.com/dotcloud/docker/runtime/execdriver"
7 7 
 	"github.com/dotcloud/docker/utils"
8 8 
 	"io/ioutil"
9 9 
 	"log"
runtime/execdriver/lxc/init.go
History View file @ 2bddcd6
... ... 
@@ -3,9 +3,9 @@ package lxc
3 3 
 import (
4 4 
 	"encoding/json"
5 5 
 	"fmt"
6 
-	"github.com/dotcloud/docker/runtime/execdriver"
7 6 
 	"github.com/dotcloud/docker/pkg/netlink"
8 7 
 	"github.com/dotcloud/docker/pkg/user"
8 
+	"github.com/dotcloud/docker/runtime/execdriver"
9 9 
 	"github.com/syndtr/gocapability/capability"
10 10 
 	"io/ioutil"
11 11 
 	"net"
runtime/execdriver/native/default_template.go
History View file @ 2bddcd6
... ... 
@@ -2,9 +2,9 @@ package native
2 2
3 3 
 import (
4 4 
 	"fmt"
5 
-	"github.com/dotcloud/docker/runtime/execdriver"
6 5 
 	"github.com/dotcloud/docker/pkg/cgroups"
7 6 
 	"github.com/dotcloud/docker/pkg/libcontainer"
7 
+	"github.com/dotcloud/docker/runtime/execdriver"
8 8 
 	"os"
9 9 
 )
10 10
runtime/execdriver/native/driver.go
History View file @ 2bddcd6
... ... 
@@ -3,12 +3,12 @@ package native
3 3 
 import (
4 4 
 	"encoding/json"
5 5 
 	"fmt"
6 
-	"github.com/dotcloud/docker/runtime/execdriver"
7 6 
 	"github.com/dotcloud/docker/pkg/cgroups"
8 7 
 	"github.com/dotcloud/docker/pkg/libcontainer"
9 8 
 	"github.com/dotcloud/docker/pkg/libcontainer/apparmor"
10 9 
 	"github.com/dotcloud/docker/pkg/libcontainer/nsinit"
11 10 
 	"github.com/dotcloud/docker/pkg/system"
11 
+	"github.com/dotcloud/docker/runtime/execdriver"
12 12 
 	"io"
13 13 
 	"io/ioutil"
14 14 
 	"log"
runtime/graphdriver/aufs/aufs.go
History View file @ 2bddcd6
... ... 
@@ -24,8 +24,8 @@ import (
24 24 
 	"bufio"
25 25 
 	"fmt"
26 26 
 	"github.com/dotcloud/docker/archive"
27 
-	"github.com/dotcloud/docker/runtime/graphdriver"
28 27 
 	mountpk "github.com/dotcloud/docker/pkg/mount"
28 
+	"github.com/dotcloud/docker/runtime/graphdriver"
29 29 
 	"github.com/dotcloud/docker/utils"
30 30 
 	"os"
31 31 
 	"os/exec"
runtime/networkdriver/ipallocator/allocator.go
History View file @ 2bddcd6
... ... 
@@ -3,8 +3,8 @@ package ipallocator
3 3 
 import (
4 4 
 	"encoding/binary"
5 5 
 	"errors"
6 
-	"github.com/dotcloud/docker/runtime/networkdriver"
7 6 
 	"github.com/dotcloud/docker/pkg/collections"
7 
+	"github.com/dotcloud/docker/runtime/networkdriver"
8 8 
 	"net"
9 9 
 	"sync"
10 10 
 )
runtime/networkdriver/lxc/driver.go
History View file @ 2bddcd6
... ... 
@@ -3,12 +3,12 @@ package lxc
3 3 
 import (
4 4 
 	"fmt"
5 5 
 	"github.com/dotcloud/docker/engine"
6 
+	"github.com/dotcloud/docker/pkg/iptables"
7 
+	"github.com/dotcloud/docker/pkg/netlink"
6 8 
 	"github.com/dotcloud/docker/runtime/networkdriver"
7 9 
 	"github.com/dotcloud/docker/runtime/networkdriver/ipallocator"
8 10 
 	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
9 11 
 	"github.com/dotcloud/docker/runtime/networkdriver/portmapper"
10 
-	"github.com/dotcloud/docker/pkg/iptables"
11 
-	"github.com/dotcloud/docker/pkg/netlink"
12 12 
 	"github.com/dotcloud/docker/utils"
13 13 
 	"io/ioutil"
14 14 
 	"log"
runtime/runtime.go
History View file @ 2bddcd6
... ... 
@@ -7,21 +7,21 @@ import (
7 7 
 	"github.com/dotcloud/docker/daemonconfig"
8 8 
 	"github.com/dotcloud/docker/dockerversion"
9 9 
 	"github.com/dotcloud/docker/engine"
10 
+	"github.com/dotcloud/docker/graph"
11 
+	"github.com/dotcloud/docker/image"
12 
+	"github.com/dotcloud/docker/pkg/graphdb"
13 
+	"github.com/dotcloud/docker/pkg/sysinfo"
14 
+	"github.com/dotcloud/docker/runconfig"
10 15 
 	"github.com/dotcloud/docker/runtime/execdriver"
11 16 
 	"github.com/dotcloud/docker/runtime/execdriver/execdrivers"
12 17 
 	"github.com/dotcloud/docker/runtime/execdriver/lxc"
13 
-	"github.com/dotcloud/docker/graph"
14 18 
 	"github.com/dotcloud/docker/runtime/graphdriver"
15 19 
 	"github.com/dotcloud/docker/runtime/graphdriver/aufs"
16 20 
 	_ "github.com/dotcloud/docker/runtime/graphdriver/btrfs"
17 21 
 	_ "github.com/dotcloud/docker/runtime/graphdriver/devmapper"
18 22 
 	_ "github.com/dotcloud/docker/runtime/graphdriver/vfs"
19 
-	"github.com/dotcloud/docker/image"
20 23 
 	_ "github.com/dotcloud/docker/runtime/networkdriver/lxc"
21 24 
 	"github.com/dotcloud/docker/runtime/networkdriver/portallocator"
22 
-	"github.com/dotcloud/docker/pkg/graphdb"
23 
-	"github.com/dotcloud/docker/pkg/sysinfo"
24 
-	"github.com/dotcloud/docker/runconfig"
25 25 
 	"github.com/dotcloud/docker/utils"
26 26 
 	"io"
27 27 
 	"io/ioutil"