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

Merge branch 'master' of github.com:grafana/grafana into getting-started-panel

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-11-21 09:00:40 +01:00
commit c1a15648c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/setting/setting.go
View File

@ -359,12 +359,12 @@ func loadConfiguration(args *CommandLineArgs) {
configFiles = append(configFiles, defaultConfigFile)
Cfg, err = ini.Load(defaultConfigFile)
Cfg.BlockMode = false
if err != nil {
log.Fatal(3, "Failed to parse defaults.ini, %v", err)
}
Cfg.BlockMode = false
// command line props
commandLineProps := getCommandLineProperties(args.Args)
// load default overrides