opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 00:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-logger' into alerting_definitions

Browse Source 
Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go
This commit is contained in:
Torkel Ödegaard
2016-06-07 13:31:56 +02:00
parent 34e17f7282 65aad44464
commit 0667d73660
29 changed files with 617 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/api.go
View File

@ -253,6 +253,9 @@ func Register(r *macaron.Macaron) {
r.Get("/changes", wrap(GetAlertChanges))
})
// error test
r.Get("/metrics/error", wrap(GenerateError))
}, reqSignedIn)
// admin api