Update prometheus vendoring to allow targetmanager Start/Wait

isabella232 · May 3, 2017 · d794c5d · d794c5d
1 parent 1b11b41
commit d794c5d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -29,7 +29,7 @@ required = ["github.com/benbjohnson/tmpl","github.com/golang/protobuf/protoc-gen
   name = "github.com/mitchellh/mapstructure"
 
 [[dependencies]]
-  branch = "go-discovery-logger"
+  branch = "logger-targetmanager-wait"
   name = "github.com/prometheus/prometheus"
   source = "github.com/goller/prometheus"
 

diff --git a/vendor/github.com/prometheus/prometheus/retrieval/targetmanager.go b/vendor/github.com/prometheus/prometheus/retrieval/targetmanager.go