Merge "FreeIPA: don't preprovision service principals if novajoin is enabled"
authorJenkins <jenkins@review.openstack.org>
Mon, 13 Feb 2017 11:18:19 +0000 (11:18 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 13 Feb 2017 11:18:19 +0000 (11:18 +0000)

Trivial merge