| commit | d6afdb1dfc16e616a4d3fac438f8820b962e8a7b | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Dec 07 23:19:26 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Dec 07 23:19:26 2016 +0000 |
| tree | 3719c07cdbf7363fa5befd48b290249d5b7d4828 | |
| parent | 53417dec74bbcbba31ef1d27a6a83c262d72b5b4 [diff] | |
| parent | 8bd5710a0e3b345453b43c46b5b7c14ae13ee104 [diff] |
Merge "Re-enable merge-mode config option and add more tests" into feature/zuulv3