Update CHANGELOG.md for 10.2.1

[ci skip]

Update CHANGELOG.md for 10.2.1
[ci skip]
9fefb6c2 · Michael Kozono · 50a5d638 · 9fefb6c2 · 50a5d638
Commit 9fefb6c2 authored Nov 22, 2017 by Michael Kozono
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

CHANGELOG.md CHANGELOG.md +7 -0

changelogs/unreleased/pawel-disable_prometheus_metrics.yml changelogs/unreleased/pawel-disable_prometheus_metrics.yml +0 -5

No files found.
--- 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)

--- a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
+++ b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
---
-title: Force disable Prometheus metrics
-merge_request:
-author:
-type: fixed