Merge "Return OpenStackVolume and OpenStackVolumeType instances from heat."
authorSteven Pisarski <s.pisarski@cablelabs.com>
Mon, 30 Oct 2017 15:24:00 +0000 (15:24 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 30 Oct 2017 15:24:00 +0000 (15:24 +0000)

Trivial merge