Merge "Update capabilities map to match latest environments"
authorJenkins <jenkins@review.openstack.org>
Thu, 3 Aug 2017 17:59:45 +0000 (17:59 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 3 Aug 2017 17:59:45 +0000 (17:59 +0000)

Trivial merge