Merge "Increase cluster sync timeout for M->N major upgrades"
authorJenkins <jenkins@review.openstack.org>
Thu, 30 Jun 2016 08:54:29 +0000 (08:54 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 30 Jun 2016 08:54:29 +0000 (08:54 +0000)

Trivial merge