More merge issues addressed
authorMichael Cambria <michael.cambria@verizon.com>
Wed, 15 Feb 2017 14:57:22 +0000 (09:57 -0500)
committerMichael Cambria <michael.cambria@verizon.com>
Wed, 15 Feb 2017 14:57:22 +0000 (09:57 -0500)
commit06e6ec2ab823a4bf1012952e0e2a56202de13697
tree4d8033efd1f4b0a0cacac14f14ba562c92163113
parente343aed11959b2818e4a59fbc676d879db0d512c
More merge issues addressed
20-macvlan0.conf
mcc-manual-add-static-env.sh
mcc-manual-del-static-env.sh
plugins/ipam/vz-local/backend/allocator/config.go
plugins/ipam/vz-local/main.go