Merge branch 'master' into cephPlugin
Conflicts: plugins/all/all.go
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
package all
|
||||
|
||||
import (
|
||||
"github.com/influxdb/telegraf/plugins/ceph"
|
||||
_ "github.com/influxdb/telegraf/plugins/ceph"
|
||||
_ "github.com/influxdb/telegraf/plugins/memcached"
|
||||
_ "github.com/influxdb/telegraf/plugins/mysql"
|
||||
_ "github.com/influxdb/telegraf/plugins/postgresql"
|
||||
_ "github.com/influxdb/telegraf/plugins/redis"
|
||||
|
||||
Reference in New Issue
Block a user