Update CHANGELOG

influxdata · May 8, 2015 · 4954a31 · 4954a31
1 parent c47585b
commit 4954a31
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ## v0.9.0-rc30 [unreleased]
 
 ### Features
+<<<<<<< HEAD
 - [#2254](https://github.com/influxdb/influxdb/pull/2254): Add Support for OpenTSDB HTTP interface. Thanks @tcolgate
+- [#2525](https://github.com/influxdb/influxdb/pull/2525): Serve broker diagnostics over HTTP
 
 ### Bugfixes
 - [#2521](https://github.com/influxdb/influxdb/pull/2521): Don't truncate topic data until fully replicated.