git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a67f5d dfd2c14)
Merge pull request #267 from rosenhouse/version-cmd
authorTom Denham <tom@tomdee.co.uk>
Fri, 12 Aug 2016 22:06:22 +0000 (15:06 -0700)
committerGitHub <noreply@github.com>
Fri, 12 Aug 2016 22:06:22 +0000 (15:06 -0700)
Adds VERSION command

1  2 
pkg/skel/skel.go patch | diff1 | diff2 | blob | history

diff --cc pkg/skel/skel.go
Simple merge
CNI changes for updated IPAM