From 5d1af0001f0a618e1622781a80254bc1b1146e70 Mon Sep 17 00:00:00 2001
From: Derek Brown <derek.brown@datadoghq.com>
Date: Wed, 17 Jan 2018 12:34:31 -0800
Subject: [PATCH] Update to latest datadog-agent hash; fix compile error

---
 glide.lock                            | 2 +-
 glide.yaml                            | 2 +-
 util/container/containers_nodocker.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/glide.lock b/glide.lock
index 3c6c9c73..02a73331 100644
--- a/glide.lock
+++ b/glide.lock
@@ -41,7 +41,7 @@ imports:
   subpackages:
   - gogen
 - name: github.com/DataDog/datadog-agent
-  version: 1ba130f025a5024df55e0a4c63f9f428721cd689
+  version: 8ada167076cecdb9dc02f7ea3f4104ae3336ea89
   subpackages:
   - cmd/agent/common/signals
   - pkg/collector/check
diff --git a/glide.yaml b/glide.yaml
index 9c0914b2..f5697288 100644
--- 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
index da8800e2..199b4e9a 100644
--- 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
 }