Merge "Specify what to do if endpoint map environment don't match"
authorJenkins <jenkins@review.openstack.org>
Tue, 24 Jan 2017 20:57:06 +0000 (20:57 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 24 Jan 2017 20:57:06 +0000 (20:57 +0000)

Trivial merge