Used fixed version of xds-server and xds-common

Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

diff --git a/gdb-xds.go b/gdb-xds.go
index e663714..37d3da8 100644 (file)
--- a/gdb-xds.go
+++ b/gdb-xds.go
@@ -12,7 +12,7 @@ import (
        common "github.com/iotbzh/xds-common/golib"
        "github.com/iotbzh/xds-server/lib/apiv1"
        "github.com/iotbzh/xds-server/lib/crosssdk"
-       "github.com/iotbzh/xds-server/lib/xdsconfig"
+       "github.com/iotbzh/xds-server/lib/folder"
        sio_client "github.com/zhouhui8915/go-socket.io-client"
 )
 
@@ -269,7 +269,7 @@ func (g *GdbXds) SendSignal(sig os.Signal) error {
 
 func getProjectsList(c *common.HTTPClient, log *logrus.Logger, prjData []byte) (int, error) {
 
-       folders := xdsconfig.FoldersConfig{}
+       folders := []folder.FolderConfig{}
        errMar := json.Unmarshal(prjData, &folders)
        msg := ""
        if errMar == nil {

diff --git a/glide.yaml b/glide.yaml
index 1e7e6c7..1f80627 100644 (file)
--- a/glide.yaml
+++ b/glide.yaml
@@ -11,13 +11,13 @@ import:
 - package: github.com/zhouhui8915/go-socket.io-client
   version: master
 - package: github.com/iotbzh/xds-server
-  version: wip
+  version: 6691c9f7c53d
   subpackages:
   - apiv1
   - crosssdk
   - xdsconfig
 - package: github.com/iotbzh/xds-common
-  version: 363bac39b844afa
+  version: 363bac39b844
   subpackages:
   - golib/common
 - package: github.com/joho/godotenv