git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc918a1 9ea5693)
Merge pull request #60 from eyakubovich/fix-plugin-del
authorMichael Bridgen <mikeb@squaremobius.net>
Tue, 22 Sep 2015 15:39:59 +0000 (16:39 +0100)
committerMichael Bridgen <mikeb@squaremobius.net>
Tue, 22 Sep 2015 15:39:59 +0000 (16:39 +0100)
bug fix: exec of DEL cmd caused JSON decode error


Trivial merge
CNI changes for updated IPAM