Set datadog-agent and datadog/gopsutil back to master

review feedback
DataDog · Jan 23, 2018 · 637c69e · 637c69e
1 parent 329bc77
commit 637c69e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/agent/main_windows.go b/agent/main_windows.go
@@ -27,8 +27,6 @@ var defaultConfigPath = "c:\\programdata\\datadog\\datadog.yaml"
 var defaultOldConfigPath = "c:\\programdata\\datadog\\datadog.conf"
 var defaultConfdPath = "c:\\programdata\\datadog\\conf.d"
 
-var ddconfigPath string //= flag.String("ddconfig", "", "Path to the datadog.yaml configuration file")
-var ddconfdPath string  //= flag.String("ddconfd", "", "Path to the conf.d directory that contains all integration config files")
 var winopts struct {
 	installService   bool
 	uninstallService bool

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,12 +2,12 @@ package: github.com/DataDog/datadog-process-agent
 import:
   - package: github.com/DataDog/datadog-agent
     vcs: git
-    version: db/merge_no_docker
+    version: master
     repo: git@github.com:DataDog/datadog-agent.git
   - package: github.com/DataDog/agent-payload
   - package: github.com/DataDog/gopsutil
     vcs: git
-    version: db/add_windows_checks
+    version: master
     subpackages:
     - gogen
   - package: github.com/shirou/gopsutil