mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Vendoring libnetwork v0.6.2-rc.1 to v1.10.2 branch
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
This commit is contained in:
parent
ba00d454e4
commit
512b0b7e6d
3 changed files with 7 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Reference in a new issue