Merge "Support for Ocata-Pike live-migration over ssh" into stable/pike
authorJenkins <jenkins@review.openstack.org>
Sat, 7 Oct 2017 05:38:24 +0000 (05:38 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 7 Oct 2017 05:38:24 +0000 (05:38 +0000)

Trivial merge