Merge "Change database sync timeout from 300 to 900 in low-memory-usage environment...
authorJenkins <jenkins@review.openstack.org>
Tue, 30 May 2017 14:51:48 +0000 (14:51 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 30 May 2017 14:51:48 +0000 (14:51 +0000)

Trivial merge