diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-11-24 21:51:38 +0100 |
|---|---|---|
| committer | Miek Gieben <miek@miek.nl>
| 2016-11-24 21:51:38 +0100 |
| commit | a951fee29119eea54bc12113737849731d1a7b82 (patch) | |
| tree | f6d20f592c73e113d5ef38e2efbc3b0e8af3f3bd /middleware/file/zone.go | |
| parent | 4a8db8a4cebce229fc46d331b68c850e8ba9b717 (diff) | |
| parent | 8dd47dd9327428fdd845c0935b6168af5101edd1 (diff) | |
| download | coredns-a951fee29119eea54bc12113737849731d1a7b82.tar.gz coredns-a951fee29119eea54bc12113737849731d1a7b82.tar.zst coredns-a951fee29119eea54bc12113737849731d1a7b82.zip | |
merge conflict fixed
Diffstat (limited to 'middleware/file/zone.go')
| -rw-r--r-- | middleware/file/zone.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/middleware/file/zone.go b/middleware/file/zone.go index 21571287d..0c0df1a1f 100644 --- a/middleware/file/zone.go +++ b/middleware/file/zone.go @@ -9,6 +9,7 @@ import ( "sync" "github.com/miekg/coredns/middleware/file/tree" + "github.com/miekg/coredns/middleware/proxy" "github.com/miekg/coredns/request" "github.com/fsnotify/fsnotify" @@ -31,6 +32,7 @@ type Zone struct { NoReload bool reloadMu sync.RWMutex ReloadShutdown chan bool + Proxy proxy.Proxy // Proxy for looking up names during the resolution process } // Apex contains the apex records of a zone: SOA, NS and their potential signatures. |