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

Vendor libnetwork @4df06c4

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
This commit is contained in:
Santhosh Manohar 2016-12-12 00:29:54 -08:00
parent b1322e3de9
commit b6b6d3ade4
12 changed files with 40 additions and 29 deletions

View file

@ -312,7 +312,7 @@ func (c *controller) clusterAgentInit() {
c.clusterConfigAvailable = true
keys := c.keys
c.Unlock()
// agent initialization needs encyrption keys and bind/remote IP which
// agent initialization needs encryption keys and bind/remote IP which
// comes from the daemon cluster events
if len(keys) > 0 {
c.agentSetup()
@ -786,7 +786,7 @@ func (c *controller) reservePools() {
}
for _, ep := range epl {
if err := ep.assignAddress(ipam, true, ep.Iface().AddressIPv6() != nil); err != nil {
logrus.Warnf("Failed to reserve current adress for endpoint %q (%s) on network %q (%s)",
logrus.Warnf("Failed to reserve current address for endpoint %q (%s) on network %q (%s)",
ep.Name(), ep.ID(), n.Name(), n.ID())
}
}