| commit | 6154e314fb1bd79beef2cfb5e4b6984a02461be3 | [log] [tgz] |
|---|---|---|
| author | Zuul <zuul@review.openstack.org> | Mon Nov 27 15:43:49 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Nov 27 15:43:49 2017 +0000 |
| tree | c05d34a1df3d207f0f5ecfc5f2031e6c7438a769 | |
| parent | 13ad363a241367996eec4caeb607b6bb2c8fa515 [diff] | |
| parent | f312f1506d2d2fd4354b6adb90c8459882c776aa [diff] |
Merge "Change Conflict's error message"