rebased

grafana · Jul 8, 2019 · 51ba819 · 51ba819
1 parent 87bc0a5
commit 51ba819
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 169 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/logproto/logproto.pb.go b/pkg/logproto/logproto.pb.go
diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go
@@ -10,6 +10,7 @@ import (
 	"github.com/cortexproject/cortex/pkg/ring"
 	"github.com/cortexproject/cortex/pkg/util"
 	token_util "github.com/grafana/loki/pkg/util"
+	"github.com/prometheus/common/model"
 	"github.com/weaveworks/common/user"
 	"google.golang.org/grpc/health/grpc_health_v1"
 

diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/chunk_store.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/chunk_store.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/series_store.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/series_store.go