Browse Source

chore(imports): Shift around some imports

Brian Waldon 12 years ago
parent
commit
c0ff8f6026
3 changed files with 8 additions and 5 deletions
  1. 2 1
      etcd.go
  2. 3 2
      server/peer_server.go
  3. 3 2
      server/server.go

+ 2 - 1
etcd.go

@@ -22,11 +22,12 @@ import (
 	"runtime"
 	"runtime"
 	"time"
 	"time"
 
 
+	"github.com/coreos/raft"
+
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
 	"github.com/coreos/etcd/metrics"
 	"github.com/coreos/etcd/server"
 	"github.com/coreos/etcd/server"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/raft"
 )
 )
 
 
 func main() {
 func main() {

+ 3 - 2
server/peer_server.go

@@ -13,12 +13,13 @@ import (
 	"strconv"
 	"strconv"
 	"time"
 	"time"
 
 
+	"github.com/coreos/raft"
+	"github.com/gorilla/mux"
+
 	etcdErr "github.com/coreos/etcd/error"
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
 	"github.com/coreos/etcd/metrics"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/raft"
-	"github.com/gorilla/mux"
 )
 )
 
 
 const retryInterval = 10
 const retryInterval = 10

+ 3 - 2
server/server.go

@@ -10,6 +10,9 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
+	"github.com/coreos/raft"
+	"github.com/gorilla/mux"
+
 	etcdErr "github.com/coreos/etcd/error"
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
 	"github.com/coreos/etcd/metrics"
@@ -18,8 +21,6 @@ import (
 	"github.com/coreos/etcd/server/v2"
 	"github.com/coreos/etcd/server/v2"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/store"
 	_ "github.com/coreos/etcd/store/v2"
 	_ "github.com/coreos/etcd/store/v2"
-	"github.com/coreos/raft"
-	"github.com/gorilla/mux"
 )
 )
 
 
 type ServerConfig struct {
 type ServerConfig struct {