tree e101d90059b6cdc7bdf5c78b926cae1c480c08e5
parent c26d283c043259ffeffadceff73a7b4c216fbb97
parent b460108e3e96da9aab536f1dbdf5e75d5faa026d
author Marek Celoud <mceloud@mirantis.com> 1503660885 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> 1503660887 +0000

Merge "Fix Keepalive vip interfere with contrail vip"