mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
This commit is contained in:
parent
518945b6bd
commit
a0dcdcb95f
27 changed files with 302 additions and 92 deletions
7
vendor/github.com/docker/libnetwork/controller.go
generated
vendored
7
vendor/github.com/docker/libnetwork/controller.go
generated
vendored
|
@ -273,7 +273,7 @@ func (c *controller) SetKeys(keys []*types.EncryptionKey) error {
|
|||
}
|
||||
for s, count := range subsysKeys {
|
||||
if count != keyringSize {
|
||||
return fmt.Errorf("incorrect number of keys for susbsystem %v", s)
|
||||
return fmt.Errorf("incorrect number of keys for subsystem %v", s)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -582,7 +582,7 @@ func (c *controller) pushNodeDiscovery(d driverapi.Driver, cap driverapi.Capabil
|
|||
err = d.DiscoverDelete(discoverapi.NodeDiscovery, nodeData)
|
||||
}
|
||||
if err != nil {
|
||||
logrus.Debugf("discovery notification error : %v", err)
|
||||
logrus.Debugf("discovery notification error: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -932,6 +932,7 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
|
|||
populatedEndpoints: map[string]struct{}{},
|
||||
config: containerConfig{},
|
||||
controller: c,
|
||||
extDNS: []extDNSEntry{},
|
||||
}
|
||||
}
|
||||
sBox = sb
|
||||
|
@ -997,7 +998,7 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
|
|||
|
||||
err = sb.storeUpdate()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("updating the store state of sandbox failed: %v", err)
|
||||
return nil, fmt.Errorf("failed to update the store state of sandbox: %v", err)
|
||||
}
|
||||
|
||||
return sb, nil
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue