Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 10:43:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict fixed

Browse Source
This commit is contained in:
Miek Gieben
2016-11-24 21:51:38 +01:00
parent 4a8db8a4ce 8dd47dd932
commit a951fee291
13 changed files with 158 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
middleware/etcd/setup_test.go
View File

@@ -9,7 +9,6 @@ import (
"testing"
"time"
"github.com/mholt/caddy"
"github.com/miekg/coredns/middleware/etcd/msg"
"github.com/miekg/coredns/middleware/pkg/dnsrecorder"
"github.com/miekg/coredns/middleware/pkg/singleflight"
@@ -17,6 +16,7 @@ import (
"github.com/miekg/coredns/middleware/test"
etcdc "github.com/coreos/etcd/client"
"github.com/mholt/caddy"
"github.com/miekg/dns"
"golang.org/x/net/context"
)