diff --git a/hack/vendor.sh b/hack/vendor.sh index fb649b185e..4b24d7b913 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -65,7 +65,7 @@ clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 clone git github.com/imdario/mergo 0.2.1 #get libnetwork packages -clone git github.com/docker/libnetwork 443b7be96fdf0ed8f65ec92953aa8df4f9a725dc +clone git github.com/docker/libnetwork 5e7bf83ab07c197d1bef6ec073d9f19ce59e3eb2 clone git github.com/docker/go-events afb2b9f2c23f33ada1a22b03651775fdc65a5089 clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/vendor/src/github.com/docker/libnetwork/network.go b/vendor/src/github.com/docker/libnetwork/network.go index 71cbced580..8d620644e6 100644 --- a/vendor/src/github.com/docker/libnetwork/network.go +++ b/vendor/src/github.com/docker/libnetwork/network.go @@ -702,12 +702,13 @@ func (n *network) driver(load bool) (driverapi.Driver, error) { } c := n.getController() + isAgent := c.isAgent() n.Lock() // If load is not required, driver, cap and err may all be nil if cap != nil { n.scope = cap.DataScope } - if c.isAgent() || n.dynamic { + if isAgent || n.dynamic { // If we are running in agent mode then all networks // in libnetwork are local scope regardless of the // backing driver.