From 7e142542b01ba8a6b7fe357cc1d2040c931e39c0 Mon Sep 17 00:00:00 2001 From: Sandeep Sukhani Date: Tue, 28 Jul 2020 12:54:12 +0530 Subject: [PATCH] fix merge conflict --- pkg/loki/modules.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index d23f7d48d254a..1fe4c0b50a5b3 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -370,8 +370,8 @@ func activePeriodConfig(cfg chunk.SchemaConfig) int { // usingBoltdbShipper check whether current or the next index type is boltdb-shipper, returns true if yes. func usingBoltdbShipper(cfg chunk.SchemaConfig) bool { activePCIndex := activePeriodConfig(cfg) - if cfg.Configs[activePCIndex].IndexType == local.BoltDBShipperType || - (len(cfg.Configs)-1 > activePCIndex && cfg.Configs[activePCIndex+1].IndexType == local.BoltDBShipperType) { + if cfg.Configs[activePCIndex].IndexType == shipper.BoltDBShipperType || + (len(cfg.Configs)-1 > activePCIndex && cfg.Configs[activePCIndex+1].IndexType == shipper.BoltDBShipperType) { return true }