summaryrefslogtreecommitdiffstats
path: root/test_merge.bash
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-19 15:53:33 +0000
committerGerrit Code Review <review@openstack.org>2015-05-19 15:53:33 +0000
commit9d536b5ea065b2bc27f82104564332d4805bfeaf (patch)
tree8f4e1ca7f87e493d9fab817dda574bc2ca155c9c /test_merge.bash
parent0e1f4815bebff3fb1a9ec7df8c95a9c7afe07577 (diff)
parent0a6c852795bf59b938a6354493b3b02f385bf1e2 (diff)
Merge "Fix RabbitMQ startup race"
Diffstat (limited to 'test_merge.bash')
0 files changed, 0 insertions, 0 deletions