prevent merge conflict

This commit is contained in:
Max U 2018-06-26 13:55:40 -07:00
parent 885e78968f
commit 5bcb5413a9
1 changed files with 0 additions and 11 deletions

View File

@ -92,16 +92,5 @@ docker-image:
plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
ragel -Z -G2 $^ -o $@ ragel -Z -G2 $^ -o $@
static:
@echo "Building static linux binary..."
@CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64 \
go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
plugin-%:
@echo "Starting dev environment for $${$(@)} input plugin..."
@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
.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 static