Vendoring libnetwork to 1.12.0-bump branch to avoid a deadlock
Tibor Vass authored on 2016/07/29 05:59:20... | ... |
@@ -65,7 +65,7 @@ clone git github.com/RackSec/srslog 259aed10dfa74ea2961eddd1d9847619f6e98837 |
65 | 65 |
clone git github.com/imdario/mergo 0.2.1 |
66 | 66 |
|
67 | 67 |
#get libnetwork packages |
68 |
-clone git github.com/docker/libnetwork 443b7be96fdf0ed8f65ec92953aa8df4f9a725dc |
|
68 |
+clone git github.com/docker/libnetwork 5e7bf83ab07c197d1bef6ec073d9f19ce59e3eb2 |
|
69 | 69 |
clone git github.com/docker/go-events afb2b9f2c23f33ada1a22b03651775fdc65a5089 |
70 | 70 |
clone git github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 |
71 | 71 |
clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec |
... | ... |
@@ -702,12 +702,13 @@ func (n *network) driver(load bool) (driverapi.Driver, error) { |
702 | 702 |
} |
703 | 703 |
|
704 | 704 |
c := n.getController() |
705 |
+ isAgent := c.isAgent() |
|
705 | 706 |
n.Lock() |
706 | 707 |
// If load is not required, driver, cap and err may all be nil |
707 | 708 |
if cap != nil { |
708 | 709 |
n.scope = cap.DataScope |
709 | 710 |
} |
710 |
- if c.isAgent() || n.dynamic { |
|
711 |
+ if isAgent || n.dynamic { |
|
711 | 712 |
// If we are running in agent mode then all networks |
712 | 713 |
// in libnetwork are local scope regardless of the |
713 | 714 |
// backing driver. |