Merge "add configurable timeouts for DB sync"
authorJenkins <jenkins@review.openstack.org>
Thu, 6 Apr 2017 09:42:27 +0000 (09:42 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 6 Apr 2017 09:42:27 +0000 (09:42 +0000)

Trivial merge