Merge branch 'master' of github.com:grafana/grafana

766b9d52 · Torkel Ödegaard · 023fa2b2 · 8910351f · 766b9d52
Commit 766b9d52 authored Dec 11, 2015 by Torkel Ödegaard
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG.md
+2 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@

 ### New Features
 * **Elasticsearch**: Support for pipeline aggregations Moving average and derivative, closes [#2715](https://github.com/grafana/grafana/issues/2715)
+* **Syslog**: Support for syslog logging, closes [#3161](https://github.com/grafana/grafana/pull/3161)
+* **Timepicker**: Always show refresh button even with refresh rate, closes [#3498](https://github.com/grafana/grafana/pull/3498)

 ### Bug Fixes
 * **metric editors**: Fix for clicking typeahead auto dropdown option, fixes [#3428](https://github.com/grafana/grafana/issues/3428)