From 512b0b7e6d5cc135c1817754025c0dde9f2e2f7f Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Wed, 17 Feb 2016 00:51:36 -0800 Subject: [PATCH] Vendoring libnetwork v0.6.2-rc.1 to v1.10.2 branch Signed-off-by: Santhosh Manohar --- hack/vendor.sh | 2 +- vendor/src/github.com/docker/libnetwork/CHANGELOG.md | 3 +++ vendor/src/github.com/docker/libnetwork/resolver.go | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index 2424c3f456..603b3a6fcd 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -27,7 +27,7 @@ clone git github.com/RackSec/srslog 6eb773f331e46fbba8eecb8e794e635e75fc04de clone git github.com/imdario/mergo 0.2.1 #get libnetwork packages -clone git github.com/docker/libnetwork v0.6.1-rc3 +clone git github.com/docker/libnetwork v0.6.2-rc.1 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 diff --git a/vendor/src/github.com/docker/libnetwork/CHANGELOG.md b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md index f10bf8f417..3113a370d3 100644 --- a/vendor/src/github.com/docker/libnetwork/CHANGELOG.md +++ b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.6.2-rc1 (2016-02-19) +- Fixes https://github.com/docker/docker/issues/20350 + ## 0.6.1-rc3 (2016-02-11) - Fixes getNetworksFromStore to not fail on inconsistent network state diff --git a/vendor/src/github.com/docker/libnetwork/resolver.go b/vendor/src/github.com/docker/libnetwork/resolver.go index e0a5e49aad..dc72140019 100644 --- a/vendor/src/github.com/docker/libnetwork/resolver.go +++ b/vendor/src/github.com/docker/libnetwork/resolver.go @@ -200,6 +200,9 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) { err error ) + if query == nil || len(query.Question) == 0 { + return + } name := query.Question[0].Name if query.Question[0].Qtype == dns.TypeA { resp, err = r.handleIPv4Query(name, query)