Merge "endpoint_map: bump nova api from 2.0 to 2.1"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Mar 2016 15:33:04 +0000 (15:33 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Mar 2016 15:33:04 +0000 (15:33 +0000)

Trivial merge