Merge branch 'v4.0.x'

This commit is contained in:
Torkel Ödegaard
2016-12-05 11:04:24 +01:00
3 changed files with 3 additions and 0 deletions

View File

@@ -54,6 +54,7 @@ due to too many connections/file handles on the data source backend. This proble
* **Singlestat**: Support repeated template variables in prefix/postfix [#6595](https://github.com/grafana/grafana/issues/6595)
* **Templating**: Don't persist variable options with refresh option [#6586](https://github.com/grafana/grafana/issues/6586)
* **Alerting**: Add ability to have OR conditions (and mixing AND & OR) [#6579](https://github.com/grafana/grafana/issues/6579)
* **InfluxDB**: Fix for Ad-Hoc Filters variable & changing dashboards [#6821](https://github.com/grafana/grafana/issues/6821)
# 4.0-beta1 (2016-11-09)