Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
alexshtin committed Oct 29, 2021
1 parent e5772b7 commit af53977
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions host/elasticsearch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

//go:build esintegration
// +build esintegration

// to run locally, make sure Elasticsearch is running,
Expand All @@ -35,6 +36,7 @@ import (
"flag"
"fmt"
"strconv"
"strings"
"testing"
"time"

Expand All @@ -50,6 +52,7 @@ import (
taskqueuepb "go.temporal.io/api/taskqueue/v1"
workflowpb "go.temporal.io/api/workflow/v1"
"go.temporal.io/api/workflowservice/v1"

esclient "go.temporal.io/server/common/persistence/visibility/elasticsearch/client"

"go.temporal.io/server/common/config"
Expand Down

0 comments on commit af53977

Please sign in to comment.