Skip to content

Commit

Permalink
[bugfix][divergence] Diverges from master in requiring change to logg…
Browse files Browse the repository at this point in the history
…ing.Debugf value changed from string
  • Loading branch information
dougbtv authored and s1061123 committed Nov 1, 2018
1 parent 25fd3ca commit ae626b4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions types/conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
)

const (
defaultCNIDir = "/var/lib/cni/multus"
defaultConfDir = "/etc/cni/multus/net.d"
defaultBinDir = "/opt/cni/bin"
defaultCNIDir = "/var/lib/cni/multus"
defaultConfDir = "/etc/cni/multus/net.d"
defaultBinDir = "/opt/cni/bin"
defaultReadinessIndicatorFile = ""
)

Expand Down Expand Up @@ -104,7 +104,7 @@ func LoadCNIRuntimeConf(args *skel.CmdArgs, k8sArgs *K8sArgs, ifName string) (*l
}

func LoadNetworkStatus(r types.Result, netName string, defaultNet bool) (*NetworkStatus, error) {
logging.Debugf("LoadNetworkStatus: %v, %s, %s", r, netName, defaultNet)
logging.Debugf("LoadNetworkStatus: %v, %s, %v", r, netName, defaultNet)

// Convert whatever the IPAM result was into the current Result type
result, err := current.NewResultFromResult(r)
Expand Down

0 comments on commit ae626b4

Please sign in to comment.