Merge "Add ServerIdMap output"
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Jul 2017 12:16:29 +0000 (12:16 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Jul 2017 12:16:29 +0000 (12:16 +0000)

Trivial merge