From: Gabe Rosenhouse <rosenhouse@users.noreply.github.com>
Date: Fri, 16 Dec 2016 02:20:34 +0000 (-0800)
Subject: Merge branch 'master' into interface-checks
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=1c1cf2faf7262f38213f7bfa222263e6a44838d7;p=cni.git

Merge branch 'master' into interface-checks
---

1c1cf2faf7262f38213f7bfa222263e6a44838d7
diff --cc plugins/ipam/host-local/backend/disk/backend.go
index 106c2da,703ec09..9c11699
--- a/plugins/ipam/host-local/backend/disk/backend.go
+++ b/plugins/ipam/host-local/backend/disk/backend.go
@@@ -20,8 -20,7 +20,9 @@@ import 
  	"net"
  	"os"
  	"path/filepath"
+ 	"strings"
 +
 +	"github.com/containernetworking/cni/plugins/ipam/host-local/backend"
  )
  
  const lastIPFile = "last_reserved_ip"