diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-11-22 14:10:25 -0800 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-11-22 14:10:25 -0800 |
| commit | 9fefb6c2be1e9772599aa376ae8ae37241ace0c6 (patch) | |
| tree | e419d8c623ffe87882ec47ae18f64b69ebd27510 | |
| parent | 50a5d638e56443ffc7d4d08b3706b9c63e372dfa (diff) | |
| download | gitlab-ce-9fefb6c2be1e9772599aa376ae8ae37241ace0c6.tar.gz | |
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 48282f67ed4..221626e7bf8 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 |