Merge "Timeout early on pcs cluster status check0 during upgrade." into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Mon, 22 May 2017 15:00:00 +0000 (15:00 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 22 May 2017 15:00:00 +0000 (15:00 +0000)

Trivial merge