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

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

Browse Source 
Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go
This commit is contained in:
woodsaj
2015-12-22 00:23:24 +08:00
parent e7a0ab76c3 c19a2e5b45
commit 0903d5541b
388 changed files with 249833 additions and 9735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/plugins/plugins.go
View File

@ -11,6 +11,7 @@ import (
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
var (
@ -77,7 +78,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
}