agent: move NotifyGroup into the agent pkg

2017-06-15 18:45:30 +02:00 · 2017-06-15 18:45:30 +02:00 · db78252019
parent 2c47bc5d5b
commit db78252019
3 changed files with 3 additions and 4 deletions
--- a/agent/agent.go
+++ b/agent/agent.go
@ -22,7 +22,6 @@ import (
 	"time"

 	"github.com/hashicorp/consul/agent/consul"
-	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/consul/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/ipaddr"
@ -135,7 +134,7 @@ type Agent struct {
 	eventBuf    []*UserEvent
 	eventIndex  int
 	eventLock   sync.RWMutex
-	eventNotify state.NotifyGroup
+	eventNotify NotifyGroup

 	reloadCh chan chan error

--- a/agent/consul/state/notify.go
+++ b/agent/consul/state/notify.go
@ -1,4 +1,4 @@
-package state
+package agent

 import (
 	"sync"
--- a/agent/consul/state/notify_test.go
+++ b/agent/consul/state/notify_test.go
@ -1,4 +1,4 @@
-package state
+package agent

 import (
 	"testing"