move options under config

2019-06-12 12:45:42 +01:00 · 2019-06-12 12:45:42 +01:00 · 97967cbe14
commit 97967cbe14
parent a6e09c9249
10 changed files with 8 additions and 8 deletions
--- a/config/options/default.go
+++ b/config/options/default.go
--- a/config/options/options.go
+++ b/config/options/options.go
--- a/proxy/grpc/grpc.go
+++ b/proxy/grpc/grpc.go
@ -10,7 +10,7 @@ import (
 	"github.com/micro/go-micro/client/grpc"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/codec/bytes"
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/proxy"
 	"github.com/micro/go-micro/server"
 )
--- a/proxy/http/http.go
+++ b/proxy/http/http.go
@ -11,7 +11,7 @@ import (
 	"path"

 	"github.com/micro/go-micro/errors"
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/proxy"
 	"github.com/micro/go-micro/server"
 )
--- a/proxy/mucp/mucp.go
+++ b/proxy/mucp/mucp.go
@ -9,7 +9,7 @@ import (
 	"github.com/micro/go-micro/client"
 	"github.com/micro/go-micro/codec"
 	"github.com/micro/go-micro/codec/bytes"
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/proxy"
 	"github.com/micro/go-micro/server"
 )
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@ -5,7 +5,7 @@ import (
 	"context"

 	"github.com/micro/go-micro/client"
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/server"
 )

--- a/store/consul/consul.go
+++ b/store/consul/consul.go
@ -6,7 +6,7 @@ import (
 	"net"

 	"github.com/hashicorp/consul/api"
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/store"
 )

--- a/store/memory/memory.go
+++ b/store/memory/memory.go
@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"

-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 	"github.com/micro/go-micro/store"
 )

--- a/store/options.go
+++ b/store/options.go
@ -1,7 +1,7 @@
 package store

 import (
-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 )

 // Set the nodes used to back the store
--- a/store/store.go
+++ b/store/store.go
@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"

-	"github.com/micro/go-micro/options"
+	"github.com/micro/go-micro/config/options"
 )

 var (