Update to latest datadog-agent hash; fix compile error

DataDog · Jan 17, 2018 · 5d1af00 · 5d1af00
1 parent c6640f2
commit 5d1af00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,7 +2,7 @@ package: github.com/DataDog/datadog-process-agent
 import:
   - package: github.com/DataDog/datadog-agent
     vcs: git
-    version: db/support_no_docker
+    version: db/merge_no_docker
     repo: git@github.com:DataDog/datadog-agent.git
   - package: github.com/DataDog/agent-payload
   - package: github.com/DataDog/gopsutil

diff --git a/util/container/containers_nodocker.go b/util/container/containers_nodocker.go
@@ -7,5 +7,5 @@ import "github.com/DataDog/datadog-agent/pkg/util/docker"
 // GetContainers is the unique method that returns all containers on the host (or in the task)
 // and that other agents can consume so that we don't have to convert all containers to the format.
 func GetContainers() ([]*docker.Container, error) {
-	return *docker.Container{}, nil
+	return make([]*docker.Container, 0), nil
 }