Merge pull request #47 from ripienaar/45

(#45) use Choria 0.5.0 and the new extracted mcorpc
choria-io · Jul 23, 2018 · 0894394 · 0894394
2 parents f786232 + 98cf64d
commit 0894394
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 21 deletions.
diff --git a/backplane/agent.go b/backplane/agent.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/choria-io/go-choria/choria"
-	"github.com/choria-io/go-choria/mcorpc"
-	"github.com/choria-io/go-choria/mcorpc/ddl/agent"
 	"github.com/choria-io/go-choria/server/agents"
+	"github.com/choria-io/mcorpc-agent-provider/mcorpc"
+	"github.com/choria-io/mcorpc-agent-provider/mcorpc/ddl/agent"
 )
 
 // Pausable is a service that can be paused

diff --git a/backplane/backplane.go b/backplane/backplane.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/choria-io/go-choria/mcorpc"
 	"github.com/choria-io/go-choria/server"
+	"github.com/choria-io/mcorpc-agent-provider/mcorpc"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/backplane/server.go b/backplane/server.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"sync"
 
-	gorpc "github.com/choria-io/go-choria/mcorpc/golang"
 	"github.com/choria-io/go-choria/server"
+	gorpc "github.com/choria-io/mcorpc-agent-provider/mcorpc/golang"
 )
 
 func (m *Management) startServer(ctx context.Context, wg *sync.WaitGroup) (err error) {

diff --git a/cmd/backplane.go b/cmd/backplane.go
@@ -13,16 +13,16 @@ import (
 	"time"
 
 	"github.com/choria-io/go-backplane/backplane"
-	"github.com/choria-io/go-choria/mcorpc"
+	"github.com/choria-io/mcorpc-agent-provider/mcorpc"
 	"github.com/fatih/color"
 
 	"github.com/sirupsen/logrus"
 
 	"github.com/choria-io/go-choria/choria"
 	"github.com/choria-io/go-choria/config"
-	rpcc "github.com/choria-io/go-choria/mcorpc/client"
 	"github.com/choria-io/go-client/client"
 	"github.com/choria-io/go-protocol/protocol"
+	rpcc "github.com/choria-io/mcorpc-agent-provider/mcorpc/client"
 
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,7 +1,7 @@
 package: github.com/choria-io/go-backplane
 import:
 - package: github.com/choria-io/go-choria
-  version: d199c482ed387e0963918e9d0771de199893f16b
+  version: 0.5.0
 - package: github.com/sirupsen/logrus
   version: ^1
 - package: gopkg.in/alecthomas/kingpin.v2