Merge "Add param to configure snat mechanism" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Wed, 6 Sep 2017 20:49:24 +0000 (20:49 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 6 Sep 2017 20:49:24 +0000 (20:49 +0000)

Trivial merge