Merge pull request #818 from prometheus/brian-brazil-patch-1

Correct change types in 0.6.x changelogs

CHANGELOG.md

@@ -16,14 +16,14 @@
 * [BUGFIX] Fix internal usage of wrong lock for silence markers
 * [BUGFIX] Adapt amtool's API parsing to recent API changes
 * [BUGFIX] Correctly marshal regexes in config JSON response
-* [ENHANCEMENT] Anchor silence regex matchers to be consistent with Prometheus
+* [CHANGE] Anchor silence regex matchers to be consistent with Prometheus
 * [ENHANCEMENT] Error if root route is using `continue` keyword
 
 ## 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.
+* [FEATURE] Add config hash metric.
 
 ## v0.6.0 / 2017-04-25
 
@@ -32,15 +32,15 @@
 * [BUGFIX] Correctly marshal regex's in config for routing tree https://github.com/prometheus/alertmanager/pull/602
 * [BUGFIX] Prevent panic when failing to load config https://github.com/prometheus/alertmanager/pull/607
 * [BUGFIX] Prevent panic when alertmanager is started with an empty `-mesh.peer` https://github.com/prometheus/alertmanager/pull/726
-* [CHANGE] Add `DELETE` as accepted CORS method https://github.com/prometheus/alertmanager/pull/641
 * [CHANGE] Rename VictorOps config variables https://github.com/prometheus/alertmanager/pull/667
-* [CHANGE] Switch to using `gogoproto` for protobuf https://github.com/prometheus/alertmanager/pull/715
 * [CHANGE] No longer generate releases for openbsd/arm https://github.com/prometheus/alertmanager/pull/732
-* [ENHANCEMENT] Add `reReplaceAll` template function https://github.com/prometheus/alertmanager/pull/639
-* [ENHANCEMENT] Expose mesh peers on status page https://github.com/prometheus/alertmanager/pull/644
-* [ENHANCEMENT] Allow label-based filtering alerts/silences through API https://github.com/prometheus/alertmanager/pull/633
+* [ENHANCEMENT] Add `DELETE` as accepted CORS method https://github.com/prometheus/alertmanager/commit/0ecc59076ca6b4cbb63252fa7720a3d89d1c81d3
+* [ENHANCEMENT] Switch to using `gogoproto` for protobuf https://github.com/prometheus/alertmanager/pull/715
 * [ENHANCEMENT] Include notifier type in logs and errors https://github.com/prometheus/alertmanager/pull/702
-* [ENHANCEMENT] Add commandline tool for interacting with alertmanager https://github.com/prometheus/alertmanager/pull/636
+* [FEATURE] Expose mesh peers on status page https://github.com/prometheus/alertmanager/pull/644
+* [FEATURE] Add `reReplaceAll` template function https://github.com/prometheus/alertmanager/pull/639
+* [FEATURE] Allow label-based filtering alerts/silences through API https://github.com/prometheus/alertmanager/pull/633
+* [FEATURE] Add commandline tool for interacting with alertmanager https://github.com/prometheus/alertmanager/pull/636
 
 ## v0.5.1 / 2016-11-24