Merge "Apache: Use conditional instead of nested stack for TLS-specific bits"
authorJenkins <jenkins@review.openstack.org>
Tue, 28 Mar 2017 11:08:34 +0000 (11:08 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 28 Mar 2017 11:08:34 +0000 (11:08 +0000)

Trivial merge