Move agent/subscribe -> agent/rpc/subscribe

agent/consul/server.go

@@ -40,8 +40,8 @@ import (
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/pool"
 	"github.com/hashicorp/consul/agent/router"
+	"github.com/hashicorp/consul/agent/rpc/subscribe"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/agent/subscribe"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"

agent/consul/subscribe_backend.go

@@ -1,11 +1,12 @@
 package consul
 
 import (
+	"google.golang.org/grpc"
+
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/stream"
 	agentgrpc "github.com/hashicorp/consul/agent/grpc"
-	"github.com/hashicorp/consul/agent/subscribe"
-	"google.golang.org/grpc"
+	"github.com/hashicorp/consul/agent/rpc/subscribe"
 )
 
 type subscribeBackend struct {