tree d6e9f263747ed14f1582b3ad8f5dd9c6fe65c16d
parent a2c0dfba264c4be92accb11521a0ec1e11d9c049
parent b7d48851799839d6c69a348ab2623991c8164ea9
author mcp-jenkins <mcp-jenkins@mirantis.com> 1540201482 +0000
committer Gerrit Code Review <mail@domain.com> 1540201482 +0000

Merge "Remove contrail_discovery from haproxy conf for OC 4.0"