tree ff71fba5d9acc7e36395e73507999a2515ebb396
parent bf49e32d7603bdab8ba11f2d430e858dd2d3b5a7
parent 073c00b09b3e00339e60c6280d1658e5962d8729
author Jenkins <jenkins@review.openstack.org> 1495038991 +0000
committer Gerrit Code Review <review@openstack.org> 1495038991 +0000

Merge "Re-enable test_live_reconfiguration_merge_conflict" into feature/zuulv3