IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

changelog: updated master version to 2.6 and merged develop branch

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-11-12 13:47:12 +01:00
parent 163b45cf37
commit d315ff2b96
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,4 +1,7 @@
# 2.5.1 (unreleased)
# 2.6.0 (unreleased)
### New Table Panel
* **table**: New powerful and flexible table panel, closes [#215](https://github.com/grafana/grafana/issues/215)
### Enhancements
* **CloudWatch**: Support for multiple AWS Credentials, closes [#3053](https://github.com/grafana/grafana/issues/3053), [#3080](https://github.com/grafana/grafana/issues/3080)

2
package.json
View File

@ -4,7 +4,7 @@
"company": "Coding Instinct AB"
},
"name": "grafana",
"version": "2.5.1-pre1",
"version": "2.6.0-pre1",
"repository": {
"type": "git",
"url": "http://github.com/torkelo/grafana.git"