Merge pull request #752 from prometheus/cut-0.6.1

*: cut 0.6.1
prometheus · Apr 28, 2017 · 5aeaf2c · 5aeaf2c
2 parents 3eb81b4 + b962597
commit 5aeaf2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v0.6.1 / 2017-04-28
+
+- [BUGFIX] Fix incorrectly serialized hash for notification providers.
+- [ENHANCEMENT] Add config hash metric.
+- [ENHANCEMENT] Add processing status field to alerts.
+
 ## v0.6.0 / 2017-04-25
 
 - [BUGFIX] Add `groupKey` to `alerts/groups` endpoint https://github.com/prometheus/alertmanager/pull/576

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.0
+0.6.1