diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-11-23 01:10:24 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-11-23 01:10:24 +0300 |
| commit | 02552132b2028a82d44ad73e6feac7a87c88f517 (patch) | |
| tree | 76b2034afee0571f33d416a983244f32df3ca8a2 | |
| parent | 082447ffa72582de0c44aaf9479851fe4a05a6db (diff) | |
Update CHANGELOG.md for 10.2.1
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/pawel-disable_prometheus_metrics.yml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b0fbcec5bb..4478671b208 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.2.1 (2017-11-22) + +### Fixed (1 change) + +- Force disable Prometheus metrics. + + ## 10.2.0 (2017-11-22) ### Security (4 changes) diff --git a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml deleted file mode 100644 index 74d83256603..00000000000 --- a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Force disable Prometheus metrics -merge_request: -author: -type: fixed |