fix merge conflicts

2015-07-09 15:09:43 -05:00
parent c0512e720c c4e5e743c4
commit 98b0543b26
20 changed files with 897 additions and 40 deletions
--- a/plugins/all/all.go
+++ b/plugins/all/all.go
@@ -6,6 +6,7 @@ import (
 	_ "github.com/influxdb/telegraf/plugins/mongodb"
 	_ "github.com/influxdb/telegraf/plugins/mysql"
 	_ "github.com/influxdb/telegraf/plugins/postgresql"
+	_ "github.com/influxdb/telegraf/plugins/prometheus"
 	_ "github.com/influxdb/telegraf/plugins/redis"
 	_ "github.com/influxdb/telegraf/plugins/system"
 )