From 59056c097a884336add117ec971450ee90c43bb2 Mon Sep 17 00:00:00 2001
From: Matthias Rampke <mr@soundcloud.com>
Date: Thu, 6 Jun 2019 12:34:05 +0000
Subject: [PATCH] update changelog for #229

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1ddc56b..7e49a4cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## unreleased / ????-??-??
+
+* [BUGFIX] Fix mapping collision for metrics with different types, but the same name ([#229](https://github.com/prometheus/statsd_exporter/pull/229))
+
 ## v0.10.5 / 2019-05-27
 
 * [BUGFIX] Fix "Error: inconsistent label cardinality: expected 0 label values but got N in prometheus.Labels" ([#224](https://github.com/prometheus/statsd_exporter/pull/224))