Exclude thrift-0.9.2 from linter

jaegertracing · Mar 19, 2017 · eb00266 · eb00266
1 parent a1083c5
commit eb00266
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ fmt:
 lint:
 	$(GOVET) $(PACKAGES)
 	@cat /dev/null > $(LINT_LOG)
-	@$(foreach pkg, $(PACKAGES), $(GOLINT) $(pkg) | grep -v thrift-gen >> $(LINT_LOG) || true;)
+	@$(foreach pkg, $(PACKAGES), $(GOLINT) $(pkg) | grep -v -e thrift-gen -e thrift-0.9.2 >> $(LINT_LOG) || true;)
 	@[ ! -s "$(LINT_LOG)" ] || (echo "Lint Failures" | cat - $(LINT_LOG) && false)
 	@$(GOFMT) -e -s -l $(ALL_SRC) > $(FMT_LOG)
 	@./scripts/updateLicenses.sh >> $(FMT_LOG)

diff --git a/cmd/agent/app/config.go b/cmd/agent/app/config.go
@@ -34,13 +34,13 @@ import (
 	zipkinThrift "github.com/uber/jaeger/thrift-gen/agent"
 	jaegerThrift "github.com/uber/jaeger/thrift-gen/jaeger"
 
-	"github.com/uber/jaeger/pkg/discovery"
-	"github.com/uber/jaeger/pkg/discovery/peerlistmgr"
 	"github.com/uber/jaeger/cmd/agent/app/processors"
 	"github.com/uber/jaeger/cmd/agent/app/reporter"
 	"github.com/uber/jaeger/cmd/agent/app/sampling"
 	"github.com/uber/jaeger/cmd/agent/app/servers"
 	"github.com/uber/jaeger/cmd/agent/app/servers/thriftudp"
+	"github.com/uber/jaeger/pkg/discovery"
+	"github.com/uber/jaeger/pkg/discovery/peerlistmgr"
 )
 
 const (