fix merge conflicts, update import paths

2015-08-13 18:57:05 -05:00
parent ceaf6fd67a c26fa33094
commit 3145a732f2
14 changed files with 313 additions and 133 deletions
--- a/outputs/all/all.go
+++ b/outputs/all/all.go
@@ -1,6 +1,6 @@
 package all

 import (
+	_ "github.com/influxdb/telegraf/outputs/datadog"
 	_ "github.com/influxdb/telegraf/outputs/influxdb"
-	_ "github.com/jipperinbham/telegraf/outputs/datadog"
 )