Merge branch 'master' into cephPlugin

Conflicts:
	plugins/all/all.go
This commit is contained in:
madz
2015-07-01 11:09:14 +08:00
5 changed files with 205 additions and 13 deletions

View File

@@ -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"