Skip to content

Commit

Permalink
Merge pull request #73 from cybertron/caddy-import
Browse files Browse the repository at this point in the history
Update caddy import to use the one from coredns
  • Loading branch information
openshift-merge-robot authored Feb 24, 2021
2 parents 40ceeed + 088b281 commit 2232793
Show file tree
Hide file tree
Showing 743 changed files with 93,632 additions and 116,924 deletions.
11 changes: 7 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
module github.com/openshift/coredns-mdns

require (
github.com/caddyserver/caddy v1.0.4
github.com/Shopify/sarama v1.21.0 // indirect
github.com/caddyserver/caddy v1.0.4 // indirect
github.com/celebdor/zeroconf v0.0.0-20190404095836-c328d57fca11
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/coredns/coredns v1.6.6
github.com/miekg/dns v1.1.25
github.com/coredns/caddy v1.1.0
github.com/coredns/coredns v1.8.1
github.com/coredns/federation v0.0.0-20190818181423-e032b096babe // indirect
github.com/miekg/dns v1.1.35
github.com/openshift/mdns-publisher v0.0.0-20200219161514-0e41fab1ddec
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
)

go 1.13
488 changes: 488 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"

"github.com/caddyserver/caddy"
"github.com/celebdor/zeroconf"
"github.com/coredns/caddy"
)

func init() {
Expand Down
88 changes: 0 additions & 88 deletions vendor/github.com/caddyserver/caddy/azure-pipelines.yml

This file was deleted.

24 changes: 0 additions & 24 deletions vendor/github.com/caddyserver/caddy/go.mod

This file was deleted.

Loading

0 comments on commit 2232793

Please sign in to comment.