public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into export-dashboard

Browse Source 
Conflicts:
	packaging/publish/publish.sh
	public/app/features/dashboard/dynamicDashboardSrv.js
	public/test/specs/dynamicDashboardSrv-specs.js
This commit is contained in:
Torkel Ödegaard
2016-05-12 10:50:37 +02:00
parent 2c7447eaca 35f55cabf0
commit 28eae1e7ff
21 changed files with 546 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/update_checker.go
+2 -2
View File
@@ -91,14 +91,14 @@ func checkForUpdates() {
resp2, err := client.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json")
if err != nil {
log.Trace("Failed to get lates.json repo from github: %v", err.Error())
log.Trace("Failed to get latest.json repo from github: %v", err.Error())
return
}
defer resp2.Body.Close()
body, err = ioutil.ReadAll(resp2.Body)
if err != nil {
log.Trace("Update check failed, reading response from github.net, %v", err.Error())
log.Trace("Update check failed, reading response from github.com, %v", err.Error())
return
}