mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'release-1.5'

Browse source
This commit is contained in:
beorn7 2017-02-10 15:45:54 +01:00
parent b4450f02bc bd1182d29f
commit e7c8a612de
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -3,7 +3,7 @@ sudo: false
language: go language: go
go: go:
- 1.7.3 - 1.7.4
go_import_path: github.com/prometheus/prometheus go_import_path: github.com/prometheus/prometheus

8
CHANGELOG.md
View file

@ -1,3 +1,11 @@
## 1.5.2 / 2017-02-10
* [BUGFIX] Fix series corruption in a special case of series maintenance where
the minimum series-file-shrink-ratio kicks in.
* [BUGFIX] Fix two panic conditions both related to processing a series
scheduled to be quarantined.
* [ENHANCEMENT] Binaries built with Go1.7.5.
## 1.5.1 / 2017-02-07 ## 1.5.1 / 2017-02-07
* [BUGFIX] Don't lose fully persisted memory series during checkpointing. * [BUGFIX] Don't lose fully persisted memory series during checkpointing.

2
VERSION
View file

@ -1 +1 @@
1.5.1 1.5.2