Merge "Remove EC2 endpoint from EndpointMap"
authorJenkins <jenkins@review.openstack.org>
Mon, 3 Apr 2017 14:23:51 +0000 (14:23 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 3 Apr 2017 14:23:51 +0000 (14:23 +0000)

Trivial merge