clearlinux/libnetwork
2
0
Fork 0
mirror of https://github.com/clearlinux/libnetwork.git synced 2026-10-04 07:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from mavenugo/vin-fixes

Browse Source 
Few more fixes identified during integration
This commit is contained in:
aboch
2015-10-10 04:09:25 -07:00
parent 15be04dbde 16e1647872
commit b5e66b502d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network.go
+4 -1
View File
@@ -86,7 +86,7 @@ type IpamConf struct {
// Validate checks whether the configuration is valid
func (c *IpamConf) Validate() error {
if c.Gateway != "" && nil == net.ParseIP(c.Gateway) {
return types.BadRequestErrorf("invalid gateway address %s in IpamConf dtructure", c.Gateway)
return types.BadRequestErrorf("invalid gateway address %s in Ipam configuration", c.Gateway)
}
return nil
}
@@ -497,6 +497,9 @@ func NetworkOptionLabels(labels map[string]string) NetworkOption {
if n.generic == nil {
n.generic = make(map[string]interface{})
}
if labels == nil {
labels = make(map[string]string)
}
// Store the options
n.generic[netlabel.GenericData] = labels
// Decode and store the endpoint options of libnetwork interest