status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-09 12:25:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9841 from hashicorp/dnephin/fix-merge-conflict

Browse Source 
[1.9.x ]Fix merge conflict
This commit is contained in:
Daniel Nephin 2021-03-02 14:45:50 -05:00 committed by GitHub
commit b1b235b787
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/health_endpoint_test.go
View File

@ -8,6 +8,7 @@ import (
"net/http/httptest"
"net/url"
"reflect"
"strconv"
"testing"
"time"

1
agent/testagent.go
View File

@ -16,7 +16,6 @@ import (
"time"
metrics "github.com/armon/go-metrics"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/errwrap"
"github.com/hashicorp/go-hclog"
uuid "github.com/hashicorp/go-uuid"