Merge "Disable Sahara by default"
authorJenkins <jenkins@review.openstack.org>
Fri, 19 Aug 2016 20:07:00 +0000 (20:07 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 19 Aug 2016 20:07:00 +0000 (20:07 +0000)

Trivial merge