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

Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks

Browse Source 
Conflicts:
	pkg/plugins/plugins.go

closes #2899
closes #2834
This commit is contained in:
carl bergquist
2015-12-16 09:21:45 +01:00
parent 2b58b6b5d7 4bb656b704
commit d4e98cd9bc
2 changed files with 100 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/plugins/plugins.go
View File

@ -10,6 +10,7 @@ import (
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
var (
@ -53,7 +54,7 @@ func scan(pluginDir string) error {
pluginPath: pluginDir,
}
if err := filepath.Walk(pluginDir, scanner.walker); err != nil {
if err := util.Walk(pluginDir, true, true, scanner.walker); err != nil {
return err
}