Merge pull request #307 from prameshj/revert-upgrade

Revert upgrade to CoreDNS 1.5.0
kubernetes · May 30, 2019 · e7a6ef7 · e7a6ef7
2 parents f0ed67c + 184ae32
commit e7a6ef7
Show file tree

Hide file tree

Showing 79 changed files with 1,445 additions and 7,101 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -47,7 +47,7 @@
 
 [[constraint]]
   name = "github.com/prometheus/client_golang"
-  version = "0.9.2"
+  version = "0.8.0"
 
 [[constraint]]
   branch = "master"
@@ -85,18 +85,10 @@
   name = "github.com/ugorji/go"
   revision = "9c7f9b7a2bc3a520f7c7b30b34b7f85f47fe27b6"
 
-[[override]]
-  name = "github.com/dnstap/golang-dnstap"
-  revision = "6b9665e675009e360f1c34b4526c2b215bc2ff68"
-
-[[override]]
-  name = "github.com/farsightsec/golang-framestream"
-  revision = "fa4b164d59b87c744f49643b5d435effba516c4e"
-
 [prune]
   go-tests = true
   unused-packages = true
   # Do not prune unused files in ginkgo. Those are needed to build ginkgo
   [[prune.project]]
     name = "github.com/onsi/ginkgo"
-    unused-packages = false
+    unused-packages = false
diff --git a/vendor/github.com/coredns/coredns/plugin/dnstap/OWNERS b/vendor/github.com/coredns/coredns/plugin/dnstap/OWNERS
diff --git a/vendor/github.com/coredns/coredns/plugin/dnstap/README.md b/vendor/github.com/coredns/coredns/plugin/dnstap/README.md
diff --git a/vendor/github.com/coredns/coredns/plugin/dnstap/dnstapio/dnstap_encoder.go b/vendor/github.com/coredns/coredns/plugin/dnstap/dnstapio/dnstap_encoder.go