Merge pull request #76 from kdembler/update-dependencies

Updated dependencies for release with updated lib-go
intelsdi-x · May 2, 2017 · df8a4d4 · df8a4d4
2 parents d508d03 + 0d2c1dc
commit df8a4d4
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/collector/collector.go b/collector/collector.go
@@ -44,7 +44,7 @@ const (
 	// namespace plugin name
 	PLUGIN_NAME = "docker"
 	// version of plugin
-	PLUGIN_VERSION = 7
+	PLUGIN_VERSION = 8
 
 	// each metric starts with prefix "/intel/docker/<docker_id>"
 	lengthOfNsPrefix = 3

diff --git a/container/fs/fs.go b/container/fs/fs.go
@@ -52,8 +52,8 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
 	zfs "github.com/mistifyio/go-zfs"
+	"github.com/moby/moby/pkg/mount"
 
 	"github.com/intelsdi-x/snap-plugin-collector-docker/config"
 	"github.com/intelsdi-x/snap-plugin-collector-docker/container"

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,23 +1,22 @@
 package: github.com/intelsdi-x/snap-plugin-collector-docker
 import:
-- package: github.com/docker/docker
-  version: ^1.13.0-rc4
-  subpackages:
-  - pkg/mount
+- package: github.com/Sirupsen/logrus
+  version: ^0.11.5
+- package: github.com/docker/go-units
+  version: ^0.3.1
 - package: github.com/fsouza/go-dockerclient
-- package: github.com/intelsdi-x/snap-plugin-utilities
-  subpackages:
-  - ns
 - package: github.com/intelsdi-x/snap-plugin-lib-go
   subpackages:
   - v1/plugin
+- package: github.com/intelsdi-x/snap-plugin-utilities
+  subpackages:
+  - ns
 - package: github.com/mistifyio/go-zfs
   version: ^2.1.1
-- package: github.com/opencontainers/runc
-  version: ^1.0.0-rc2
+- package: github.com/moby/moby
+  version: ^1.13.0-rc4
   subpackages:
-  - libcontainer/cgroups
-  - libcontainer/cgroups/fs
+  - pkg/mount
 - package: github.com/stretchr/testify
   version: ^1.1.4
   subpackages: