| commit | cbf87aff207d76c106e5a53644a6f4f69b355cf2 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Nov 25 04:58:49 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Nov 25 04:58:49 2014 +0000 |
| tree | d6cbac44f5c29f5299ac832409ba53fcbdf007e0 | |
| parent | 9981e16846fdfbae294e31d565e215ad4f0a70bd [diff] | |
| parent | 25eac026a4447e786150f509c93f3c9d19fad272 [diff] |
Merge "Add Conflict exception in test_floating_ips_actions case"