summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-10-26 18:02:21 +0000
committerDouwe Maan <douwe@gitlab.com>2018-10-26 18:02:21 +0000
commit578064df4d58fb0409fec51fe03c4b95181a5f5f (patch)
treec1a76b1db27d25a38dbac0031f70815f74034e2f /changelogs
parent238d9d38621ee8628d7dbcf81a2ebef09ba3456b (diff)
parentbc8ced6287dd50fee4c4c2eca682c71c3fc80698 (diff)
downloadgitlab-ce-578064df4d58fb0409fec51fe03c4b95181a5f5f.tar.gz
Merge branch 'pl-uprade-prometheus-alertmanager' into 'master'
Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2 See merge request gitlab-org/gitlab-ce!22600
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml
new file mode 100644
index 00000000000..d0c8ed8001d
--- /dev/null
+++ b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
+merge_request: 22600
+author:
+type: other