git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fc3874 65060a0)
Merge pull request #98 from apcera/remove-addif
authorJonathan Boulle <jonathanboulle@gmail.com>
Fri, 22 Jan 2016 19:33:22 +0000 (20:33 +0100)
committerJonathan Boulle <jonathanboulle@gmail.com>
Fri, 22 Jan 2016 19:33:22 +0000 (20:33 +0100)
spec: Removed reference to unsupported addIf attribute


Trivial merge
CNI changes for updated IPAM