Merge pull request #2425 from prometheus/beorn7/vendoring

vendoring: Do not ignore appengine build tags
This commit is contained in:
Björn Rabenstein 2017-02-14 22:14:27 +01:00 committed by GitHub
commit a37d39c463
2 changed files with 17 additions and 2 deletions

15
vendor/github.com/miekg/dns/udp_other.go generated vendored Normal file
View File

@ -0,0 +1,15 @@
// +build !linux appengine
package dns
import (
"net"
)
// These do nothing. See udp_linux.go for an example of how to implement this.
// We tried to adhire to some kind of naming scheme.
func setUDPSocketOptions(conn *net.UDPConn) error { return nil }
func setUDPSocketOptions4(conn *net.UDPConn) error { return nil }
func setUDPSocketOptions6(conn *net.UDPConn) error { return nil }
func getUDPSocketOptions6Only(conn *net.UDPConn) (bool, error) { return false, nil }

4
vendor/vendor.json vendored
View File

@ -1,6 +1,6 @@
{
"comment": "",
"ignore": "test appengine",
"ignore": "test",
"package": [
{
"checksumSHA1": "Cslv4/ITyQmgjSUhNXFu8q5bqOU=",
@ -508,7 +508,7 @@
"revisionTime": "2015-04-06T19:39:34+02:00"
},
{
"checksumSHA1": "wJxkqZ80Ux6+klKr1+3erSZjVnQ=",
"checksumSHA1": "UoQnBcZrj1gvLAK+MGNB+E7+AIE=",
"path": "github.com/miekg/dns",
"revision": "672033dedc09500ca4d340760d0b80b9c0b198bd",
"revisionTime": "2017-02-13T20:16:50Z"