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

torkelo · torkelo · commit 5f5bbfbda575 · 2016-09-28T21:12:37.000+02:00
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
@@ -563,7 +563,7 @@ func NewConfigContext(args *CommandLineArgs) error {
 		log.Warn("require_email_validation is enabled but smpt is disabled")
 	}
 
-	GrafanaNetUrl = Cfg.Section("grafana.net").Key("url").MustString("https://grafana.net")
+	GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net")
 
 	imageUploadingSection := Cfg.Section("external_image_storage")
 	ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ func NewConfigContext(args *CommandLineArgs) error {`
`563`	`563`	`log.Warn("require_email_validation is enabled but smpt is disabled")`
`564`	`564`	`}`
`565`	`565`
`566`		`- GrafanaNetUrl = Cfg.Section("grafana.net").Key("url").MustString("https://grafana.net")`
	`566`	`+ GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net")`
`567`	`567`
`568`	`568`	`imageUploadingSection := Cfg.Section("external_image_storage")`
`569`	`569`	`ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")`