all: sort imports

Roger Peppe · Roger Peppe · commit dfcd31ee6823 · 2014-05-23T12:24:54.000+01:00
diff --git a/agent/format-1.16.go b/agent/format-1.16.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 
 	"launchpad.net/goyaml"
+
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/version"
 )
diff --git a/agent/format-1.16_whitebox_test.go b/agent/format-1.16_whitebox_test.go
@@ -12,8 +12,8 @@ import (
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
-
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
diff --git a/agent/format-1.18.go b/agent/format-1.18.go
@@ -9,6 +9,7 @@ import (
 	"strconv"
 
 	"launchpad.net/goyaml"
+
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/version"
 )
diff --git a/agent/format-1.18_whitebox_test.go b/agent/format-1.18_whitebox_test.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
-
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
diff --git a/cmd/juju/user_add.go b/cmd/juju/user_add.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 
 	"launchpad.net/gnuflag"
+
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
 	"launchpad.net/juju-core/environs/configstore"
diff --git a/cmd/juju/user_add_test.go b/cmd/juju/user_add_test.go
@@ -9,10 +9,10 @@ import (
 
 	gc "launchpad.net/gocheck"
 	"launchpad.net/goyaml"
-	jujutesting "launchpad.net/juju-core/juju/testing"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/cmd/envcmd"
+	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/testing"
 )
 
diff --git a/cmd/juju/user_test.go b/cmd/juju/user_test.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	gc "launchpad.net/gocheck"
+
 	coretesting "launchpad.net/juju-core/testing"
 )
 
diff --git a/cmd/supercommand.go b/cmd/supercommand.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/juju/loggo"
 	"launchpad.net/gnuflag"
+
 	"launchpad.net/juju-core/version"
 )
 
diff --git a/provider/common/supportedarchitectures_test.go b/provider/common/supportedarchitectures_test.go
@@ -4,9 +4,8 @@
 package common_test
 
 import (
-	gc "launchpad.net/gocheck"
-
 	jc "github.com/juju/testing/checkers"
+	gc "launchpad.net/gocheck"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/imagemetadata"
diff --git a/provider/joyent/environ_firewall.go b/provider/joyent/environ_firewall.go
@@ -8,10 +8,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/joyent/gosdc/cloudapi"
+
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
-
-	"github.com/joyent/gosdc/cloudapi"
 )
 
 const (
diff --git a/provider/joyent/instance_firewall.go b/provider/joyent/instance_firewall.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/joyent/gosdc/cloudapi"
+
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
-
-	"github.com/joyent/gosdc/cloudapi"
 )
 
 const (
diff --git a/provider/joyent/provider.go b/provider/joyent/provider.go
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/joyent/gosign/auth"
 	"github.com/juju/loggo"
 
-	"github.com/joyent/gosign/auth"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/imagemetadata"
diff --git a/provider/joyent/storage.go b/provider/joyent/storage.go
@@ -13,13 +13,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/juju/errors"
-	"launchpad.net/juju-core/environs/storage"
-	"launchpad.net/juju-core/utils"
-
 	"github.com/joyent/gocommon/client"
 	je "github.com/joyent/gocommon/errors"
 	"github.com/joyent/gomanta/manta"
+	"github.com/juju/errors"
+
+	"launchpad.net/juju-core/environs/storage"
+	"launchpad.net/juju-core/utils"
 )
 
 type JoyentStorage struct {
diff --git a/state/address.go b/state/address.go
@@ -8,6 +8,7 @@ import (
 
 	"labix.org/v2/mgo/bson"
 	"labix.org/v2/mgo/txn"
+
 	"launchpad.net/juju-core/instance"
 )
 
diff --git a/state/api/usermanager/client.go b/state/api/usermanager/client.go
@@ -5,6 +5,7 @@ package usermanager
 
 import (
 	"fmt"
+
 	"launchpad.net/juju-core/names"
 	"launchpad.net/juju-core/state/api"
 	"launchpad.net/juju-core/state/api/params"
diff --git a/state/api/usermanager/client_test.go b/state/api/usermanager/client_test.go
@@ -5,6 +5,7 @@ package usermanager_test
 
 import (
 	gc "launchpad.net/gocheck"
+
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/usermanager"
diff --git a/state/api/watcher/watcher.go b/state/api/watcher/watcher.go
@@ -4,9 +4,9 @@
 package watcher
 
 import (
-	"github.com/juju/loggo"
 	"sync"
 
+	"github.com/juju/loggo"
 	"launchpad.net/tomb"
 
 	"launchpad.net/juju-core/state/api/base"
diff --git a/state/apiserver/tools_test.go b/state/apiserver/tools_test.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"path"
+	"path/filepath"
 
 	gc "launchpad.net/gocheck"
 
@@ -18,7 +19,6 @@ import (
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
-	"path/filepath"
 )
 
 type toolsSuite struct {
diff --git a/utils/limiter_test.go b/utils/limiter_test.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"time"
 
+	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	jc "github.com/juju/testing/checkers"
 	coretesting "launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils"
 )
diff --git a/utils/registry/registry_test.go b/utils/registry/registry_test.go
@@ -6,10 +6,10 @@ package registry_test
 import (
 	"reflect"
 
+	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
 
-	"github.com/juju/errors"
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/utils/registry"
 )
diff --git a/worker/firewaller/firewaller_test.go b/worker/firewaller/firewaller_test.go
@@ -4,13 +4,13 @@
 package firewaller_test
 
 import (
-	"launchpad.net/juju-core/environs/config"
 	"reflect"
 	stdtesting "testing"
 	"time"
 
 	gc "launchpad.net/gocheck"
 
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/instance"
 	"launchpad.net/juju-core/juju"
 	"launchpad.net/juju-core/juju/testing"
diff --git a/worker/singular/singular_test.go b/worker/singular/singular_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	jc "github.com/juju/testing/checkers"
-
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/testing"
 	"launchpad.net/juju-core/worker"
 	"launchpad.net/juju-core/worker/singular"
diff --git a/worker/upgrader/upgrader_test.go b/worker/upgrader/upgrader_test.go
@@ -11,10 +11,9 @@ import (
 	"time"
 
 	"github.com/juju/errors"
+	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
-	coretesting "launchpad.net/juju-core/testing"
 
-	jc "github.com/juju/testing/checkers"
 	"launchpad.net/juju-core/agent"
 	agenttools "launchpad.net/juju-core/agent/tools"
 	envtesting "launchpad.net/juju-core/environs/testing"
@@ -24,6 +23,7 @@ import (
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	statetesting "launchpad.net/juju-core/state/testing"
+	coretesting "launchpad.net/juju-core/testing"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"strconv"`
`11`	`11`
`12`	`12`	`"launchpad.net/goyaml"`
	`13`	`+`
`13`	`14`	`"launchpad.net/juju-core/state/api/params"`
`14`	`15`	`"launchpad.net/juju-core/version"`
`15`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"strconv"`
`10`	`10`
`11`	`11`	`"launchpad.net/goyaml"`
	`12`	`+`
`12`	`13`	`"launchpad.net/juju-core/state/api/params"`
`13`	`14`	`"launchpad.net/juju-core/version"`
`14`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ import (`
`9`	`9`
`10`	`10`	`gc "launchpad.net/gocheck"`
`11`	`11`	`"launchpad.net/goyaml"`
`12`		`- jujutesting "launchpad.net/juju-core/juju/testing"`
`13`	`12`
`14`	`13`	`"launchpad.net/juju-core/cmd"`
`15`	`14`	`"launchpad.net/juju-core/cmd/envcmd"`
	`15`	`+ jujutesting "launchpad.net/juju-core/juju/testing"`
`16`	`16`	`"launchpad.net/juju-core/testing"`
`17`	`17`	`)`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`
`9`	`9`	`gc "launchpad.net/gocheck"`
	`10`	`+`
`10`	`11`	`coretesting "launchpad.net/juju-core/testing"`
`11`	`12`	`)`
`12`	`13`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/juju/loggo"`
`14`	`14`	`"launchpad.net/gnuflag"`
	`15`	`+`
`15`	`16`	`"launchpad.net/juju-core/version"`
`16`	`17`	`)`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"labix.org/v2/mgo/bson"`
`10`	`10`	`"labix.org/v2/mgo/txn"`
	`11`	`+`
`11`	`12`	`"launchpad.net/juju-core/instance"`
`12`	`13`	`)`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import (`
`7`	`7`	`"fmt"`
`8`	`8`	`"time"`
`9`	`9`
	`10`	`+ jc "github.com/juju/testing/checkers"`
`10`	`11`	`gc "launchpad.net/gocheck"`
`11`	`12`
`12`		`- jc "github.com/juju/testing/checkers"`
`13`	`13`	`coretesting "launchpad.net/juju-core/testing"`
`14`	`14`	`"launchpad.net/juju-core/utils"`
`15`	`15`	`)`