diff options
| author | Alessandro Boch <aboch@docker.com> | 2016-04-18 15:11:36 -0700 |
|---|---|---|
| committer | Alessandro Boch <aboch@docker.com> | 2016-05-12 10:27:10 -0700 |
| commit | 651f6ea0fa7379c31d19a71b41ab8f4b548787d5 (patch) | |
| tree | e140c1877d9fbae2a76043079f789854357bb63a /libnetwork/drvregistry | |
| parent | 0de68331ab71fed62560e6d149088696e4d1e8e3 (diff) | |
| download | docker-651f6ea0fa7379c31d19a71b41ab8f4b548787d5.tar.gz | |
Avoid persisting ipam data if it can be reconstructed
- Also restore older behavior where overlap check is not run
when preferred pool is specified. Got broken by recent changes
Signed-off-by: Alessandro Boch <aboch@docker.com>
Diffstat (limited to 'libnetwork/drvregistry')
| -rw-r--r-- | libnetwork/drvregistry/drvregistry.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnetwork/drvregistry/drvregistry.go b/libnetwork/drvregistry/drvregistry.go index 6c1804dfa9..f12da15c0b 100644 --- a/libnetwork/drvregistry/drvregistry.go +++ b/libnetwork/drvregistry/drvregistry.go @@ -163,7 +163,7 @@ func (r *DrvRegistry) initIPAMs(lDs, gDs interface{}) error { remoteIpam.Init, nullIpam.Init, } { - if err := fn(r, lDs, gDs); err != nil { + if err := fn(r, nil, gDs); err != nil { return err } } |