Merge "Special treatment for os-net-config upgrade." into stable/pike
authorJenkins <jenkins@review.openstack.org>
Tue, 10 Oct 2017 01:11:32 +0000 (01:11 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 10 Oct 2017 01:11:32 +0000 (01:11 +0000)

Trivial merge