Merge "Add Sahara profiles"
authorJenkins <jenkins@review.openstack.org>
Thu, 2 Jun 2016 12:18:41 +0000 (12:18 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 2 Jun 2016 12:18:41 +0000 (12:18 +0000)

Trivial merge