Merge pull request #4375 from prometheus/release-2.3

Merge 2.3.2 release back to master
6 years ago · 3ee7a6a6c2
parent f32acc0b7b 5b596b97bc
commit 3ee7a6a6c2
2 changed files with 11 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,13 @@
+## 2.3.2 / 2018-07-12
+
+* [BUGFIX] Fix various tsdb bugs #4369
+* [BUGFIX] Reorder startup and shutdown to prevent panics. #4321
+* [BUGFIX] Exit with non-zero code on error #4296
+* [BUGFIX] discovery/kubernetes/ingress: fix scheme discovery #4329
+* [BUGFIX] Fix race in zookeeper sd #4355
+* [BUGFIX] Better timeout handling in promql #4291 #4300
+* [BUGFIX] Propogate errors when selecting series from the tsdb #4136
+
 ## 2.3.1 / 2018-06-19

 * [BUGFIX] Avoid infinite loop on duplicate NaN values. #4275
--- a/2
+++ b/2
@ -1 +1 @@
-2.3.1
+2.3.2
 @ -1 +1 @@
 .3.1
 .3.2