RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2230 from prometheus/cut-1.4.1 

*: cut 1.4.1
This commit is contained in:
Fabian Reinartz 2016-11-28 09:33:26 +01:00 committed by GitHub
parent ecad074e46 6be1e98278
commit 2a89e8733f
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

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

2
VERSION
View File

@ -1 +1 @@
1.4.0 1.4.1

2
circle.yml
View File

@ -2,7 +2,7 @@ machine:
environment: environment:
DOCKER_IMAGE_NAME: prom/prometheus DOCKER_IMAGE_NAME: prom/prometheus
QUAY_IMAGE_NAME: quay.io/prometheus/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 REPO_PATH: github.com/prometheus/prometheus
pre: pre:
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci' - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'

2
discovery/consul/consul.go
View File

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