git://git.halfball.org / cni.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e7c1812) | patch
Pulled from github 2017-Feb-14, dealt with merge
authorMichael Cambria <michael.cambria@verizon.com>
Wed, 15 Feb 2017 13:53:24 +0000 (08:53 -0500)
committerMichael Cambria <michael.cambria@verizon.com>
Wed, 15 Feb 2017 13:53:24 +0000 (08:53 -0500)
commite343aed11959b2818e4a59fbc676d879db0d512c
tree95e2793a832693e5252a449522af5bd88cef383btree | snapshot
parente7c1812e2451f92400f2aa3f03cab30bcc5e5085commit | diff
Pulled from github 2017-Feb-14, dealt with merge
13 files changed:
plugins/ipam/vz-local/#allocator.go# [deleted file] blob | history
plugins/ipam/vz-local/README.md diff | blob | history
plugins/ipam/vz-local/backend/allocator/allocator.go [moved from plugins/ipam/vz-local/allocator.go with 87% similarity] diff | blob | history
plugins/ipam/vz-local/backend/allocator/allocator_suite_test.go [moved from plugins/ipam/vz-local/host_local_suite_test.go with 88% similarity] diff | blob | history
plugins/ipam/vz-local/backend/allocator/allocator_test.go [moved from plugins/ipam/vz-local/allocator_test.go with 90% similarity] diff | blob | history
plugins/ipam/vz-local/backend/allocator/config.go [new file with mode: 0644] blob
plugins/ipam/vz-local/backend/disk/backend.go diff | blob | history
plugins/ipam/vz-local/backend/testing/fake_store.go diff | blob | history
plugins/ipam/vz-local/config.go [deleted file] blob | history
plugins/ipam/vz-local/dns.go [new file with mode: 0644] blob
plugins/ipam/vz-local/dns_test.go [new file with mode: 0644] blob
plugins/ipam/vz-local/host_local_test.go diff | blob | history
plugins/ipam/vz-local/main.go diff | blob | history
CNI changes for updated IPAM