| commit | 415d1fe1983d75b33b61ab9e6cfdc67a3aaa279c | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed May 17 16:36:31 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed May 17 16:36:31 2017 +0000 |
| tree | ff71fba5d9acc7e36395e73507999a2515ebb396 | |
| parent | bf49e32d7603bdab8ba11f2d430e858dd2d3b5a7 [diff] | |
| parent | 073c00b09b3e00339e60c6280d1658e5962d8729 [diff] |
Merge "Re-enable test_live_reconfiguration_merge_conflict" into feature/zuulv3