0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vendor libnetwork v0.6.1-rc3

Browse source 
- fixes https://github.com/docker/docker/issues/20140

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2016-02-11 09:44:02 -08:00
parent 6ab0256048
commit 484b451a3d
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/vendor.sh
View file

@ -27,7 +27,7 @@ clone git github.com/RackSec/srslog 6eb773f331e46fbba8eecb8e794e635e75fc04de
clone git github.com/imdario/mergo 0.2.1 clone git github.com/imdario/mergo 0.2.1
#get libnetwork packages #get libnetwork packages
clone git github.com/docker/libnetwork v0.6.1-rc2 clone git github.com/docker/libnetwork v0.6.1-rc3
clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4

3
vendor/src/github.com/docker/libnetwork/CHANGELOG.md vendored
View file

@ -1,5 +1,8 @@
# Changelog # Changelog
## 0.6.1-rc3 (2016-02-11)
- Fixes getNetworksFromStore to not fail on inconsistent network state
## 0.6.1-rc2 (2016-02-09) ## 0.6.1-rc2 (2016-02-09)
- Fixes https://github.com/docker/docker/issues/20132 - Fixes https://github.com/docker/docker/issues/20132
- Fixes https://github.com/docker/docker/issues/20140 - Fixes https://github.com/docker/docker/issues/20140

3
vendor/src/github.com/docker/libnetwork/store.go vendored
View file

@ -139,7 +139,8 @@ func (c *controller) getNetworksFromStore() ([]*network, error) {
ec := &endpointCnt{n: n} ec := &endpointCnt{n: n}
err = store.GetObject(datastore.Key(ec.Key()...), ec) err = store.GetObject(datastore.Key(ec.Key()...), ec)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err) log.Warnf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err)
continue
} }
n.epCnt = ec n.epCnt = ec