tree 7089f5f6d6833f3d387447763c78b252a5759ef7
parent 3c84e27728661408546281387628e5a9d1dbbddf
parent a07adf3cf598db69888c17c80c4c00c6594e6222
author mcp-jenkins <mcp-jenkins@mirantis.com> 1515076027 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> 1515076027 +0000

Merge "add ability to run without discovery in contrail 3.x"