Merge pull request #2230 from prometheus/cut-1.4.1

*: cut 1.4.1

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.1 / 2016-11-28
+
+* [BUGFIX] Fix Consul service discovery
+
 ## 1.4.0 / 2016-11-25
 
 * [FEATURE] Allow configuring Alertmanagers via service discovery

VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

circle.yml

@@ -2,7 +2,7 @@ machine:
   environment:
     DOCKER_IMAGE_NAME: prom/prometheus
     QUAY_IMAGE_NAME: quay.io/prometheus/prometheus
-    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6-base
+    DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.7-base
     REPO_PATH: github.com/prometheus/prometheus
   pre:
     - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'

discovery/consul/consul.go

@@ -197,7 +197,7 @@ func (cd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) {
 			}
 
 			wctx, cancel := context.WithCancel(ctx)
-			srv.watch(wctx, ch)
+			go srv.watch(wctx, ch)
 
 			services[name] = cancel
 		}