kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1614 from sanimej/godep

Browse source 
Carry libnetwork change from docker/docker #29564
This commit is contained in:
Alessandro Boch 2017-01-10 13:38:54 -08:00 committed by GitHub
commit da6c6baa92
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/Godeps/Godeps.json generated
View file

@ -143,8 +143,8 @@
},
{
"ImportPath": "github.com/docker/docker/pkg/plugingetter",
"Comment": "docs-v1.12.0-rc4-2016-07-15-4185-ge4512d2",
"Rev": "e4512d264741e83e954a19f9ef5e3cb06c5856b6"
"Comment": "docs-v1.12.0-rc4-2016-07-15-1985-g9c96768",
"Rev": "9c96768eae4b3a65147b47a55c850c103ab8972d"
},
{
"ImportPath": "github.com/docker/docker/pkg/plugins",

12
libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/plugingetter/getter.go generated vendored
View file

@ -3,12 +3,12 @@ package plugingetter
import "github.com/docker/docker/pkg/plugins"
const (
// LOOKUP doesn't update RefCount
LOOKUP = 0
// ACQUIRE increments RefCount
ACQUIRE = 1
// RELEASE decrements RefCount
RELEASE = -1
// Lookup doesn't update RefCount
Lookup = 0
// Acquire increments RefCount
Acquire = 1
// Release decrements RefCount
Release = -1
)
// CompatPlugin is an abstraction to handle both v2(new) and v1(legacy) plugins.

4
libnetwork/controller.go
View file

@ -1088,7 +1088,7 @@ func (c *controller) loadDriver(networkType string) error {
var err error
if pg := c.GetPluginGetter(); pg != nil {
_, err = pg.Get(networkType, driverapi.NetworkPluginEndpointType, plugingetter.LOOKUP)
_, err = pg.Get(networkType, driverapi.NetworkPluginEndpointType, plugingetter.Lookup)
} else {
_, err = plugins.Get(networkType, driverapi.NetworkPluginEndpointType)
}
@ -1107,7 +1107,7 @@ func (c *controller) loadIPAMDriver(name string) error {
var err error
if pg := c.GetPluginGetter(); pg != nil {
_, err = pg.Get(name, ipamapi.PluginEndpointType, plugingetter.LOOKUP)
_, err = pg.Get(name, ipamapi.PluginEndpointType, plugingetter.Lookup)
} else {
_, err = plugins.Get(name, ipamapi.PluginEndpointType)
}