More v2 changes

codysoyland · Oct 8, 2019 · 995e18f · 995e18f
1 parent 0d0a195
commit 995e18f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ BRANCH := $(if $(TRAVIS_BRANCH),$(TRAVIS_BRANCH),$(if $(CIRCLE_BRANCH),$(CIRCLE_
 BRANCH_ID := $(BRANCH)-$(GOOS)-$(GOARCH)
 BUILD_TIME := $(shell date -u +%FT%T%z)
 SHARD_WIDTH = 20
-LDFLAGS="-X github.com/pilosa/pilosa.Version=$(VERSION) -X github.com/pilosa/pilosa.BuildTime=$(BUILD_TIME) -X github.com/pilosa/pilosa.Enterprise=$(if $(ENTERPRISE_ENABLED),1)"
+LDFLAGS="-X github.com/pilosa/pilosa/v2.Version=$(VERSION) -X github.com/pilosa/pilosa/v2.BuildTime=$(BUILD_TIME) -X github.com/pilosa/pilosa/v2.Enterprise=$(if $(ENTERPRISE_ENABLED),1)"
 GO_VERSION=latest
 ENTERPRISE ?= 0
 ENTERPRISE_ENABLED = $(subst 0,,$(ENTERPRISE))
@@ -106,11 +106,11 @@ install:
 
 # `go generate` protocol buffers
 generate-protoc: require-protoc require-protoc-gen-gofast
-	go generate github.com/pilosa/pilosa/internal
+	go generate github.com/pilosa/pilosa/v2/internal
 
 # `go generate` stringers
 generate-stringer:
-	go generate github.com/pilosa/pilosa
+	go generate github.com/pilosa/pilosa/v2
 
 generate-pql: require-peg
 	cd pql && peg -inline pql.peg && cd ..

diff --git a/roaring/roaring_stats.go b/roaring/roaring_stats.go
@@ -17,7 +17,7 @@
 package roaring
 
 import (
-	"github.com/pilosa/pilosa/stats"
+	"github.com/pilosa/pilosa/v2/stats"
 )
 
 var statsEv = stats.NewExpvarStatsClient()

diff --git a/server/enterprise.go b/server/enterprise.go
@@ -17,5 +17,5 @@
 package server
 
 import (
-	_ "github.com/pilosa/pilosa/enterprise"
+	_ "github.com/pilosa/pilosa/v2/enterprise"
 )
diff --git a/server/setup_logger_arm64.go b/server/setup_logger_arm64.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/pilosa/pilosa/logger"
+	"github.com/pilosa/pilosa/v2/logger"
 	"github.com/pkg/errors"
 )