dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:influxdata/telegraf into plugin/reader

Browse Source
This commit is contained in:
Max U
2018-06-26 14:00:07 -07:00
parent 5bcb5413a9 23523ffd10
commit 5529d51df7
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -91,6 +91,11 @@ docker-image:
plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
ragel -Z -G2 $^ -o $@
<<<<<<< HEAD
.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64 static
=======
.PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64
>>>>>>> 23523ffd10bac33b0e40bad98bee4213049109ff