Merge pull request #47 from ripienaar/45

ripienaar · web-flow · commit 08943949ac88 · 2018-07-23T19:45:59.000+03:00
(#45) use Choria 0.5.0 and the new extracted mcorpc
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

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`	`"sync"`
`21`	`21`
`22`		`- "github.com/choria-io/go-choria/mcorpc"`
`23`	`22`	`"github.com/choria-io/go-choria/server"`
	`23`	`+ "github.com/choria-io/mcorpc-agent-provider/mcorpc"`
`24`	`24`	`"github.com/sirupsen/logrus"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"sync"`
`7`	`7`
`8`		`- gorpc "github.com/choria-io/go-choria/mcorpc/golang"`
`9`	`8`	`"github.com/choria-io/go-choria/server"`
	`9`	`+ gorpc "github.com/choria-io/mcorpc-agent-provider/mcorpc/golang"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func (m Management) startServer(ctx context.Context, wg sync.WaitGroup) (err error) {`