opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-14 19:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update libnetwork vendor to current master to fix CI

Browse Source 
Avoid a Sirupsen vs sirupsen class for logrus by updating to
master.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon
2018-09-25 12:41:40 -04:00
parent e4ded6ce7f
commit bc5fac3a7c
30 changed files with 2552 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/github.com/docker/libnetwork/netutils/utils.go generated vendored
View File

@ -14,13 +14,6 @@ import (
"github.com/docker/libnetwork/types"
)
// constants for the IP address type
const (
IP = iota // IPv4 and IPv6
IPv4
IPv6
)
var (
// ErrNetworkOverlapsWithNameservers preformatted error
ErrNetworkOverlapsWithNameservers = errors.New("requested network overlaps with nameserver")
@ -177,10 +170,10 @@ func ReverseIP(IP string) string {
return strings.Join(reverseIP, ".")
}
// ParseAlias parses and validates the specified string as a alias format (name:alias)
// ParseAlias parses and validates the specified string as an alias format (name:alias)
func ParseAlias(val string) (string, string, error) {
if val == "" {
return "", "", fmt.Errorf("empty string specified for alias")
return "", "", errors.New("empty string specified for alias")
}
arr := strings.Split(val, ":")
if len(arr) > 2 {