diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-06-24 23:57:10 +0400 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-06-24 23:57:10 +0400 |
| commit | 153621b9f3a4480b544de5ccd2a96bf4d63adbc9 (patch) | |
| tree | efd5496c738aec4751742ff2084571da742bb6e9 | |
| parent | 09d439cd74290a6b2532376afc94d2c8e23cdda6 (diff) | |
conflict resolved
| -rw-r--r-- | nova/tests/api/openstack/contrib/test_floating_ips.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nova/tests/api/openstack/contrib/test_floating_ips.py b/nova/tests/api/openstack/contrib/test_floating_ips.py index 31b571eb9..5dca0b5ea 100644 --- a/nova/tests/api/openstack/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/contrib/test_floating_ips.py @@ -15,16 +15,12 @@ from nova import context from nova import db from nova import test -<<<<<<< TREE -from nova.api.openstack.contrib.floating_ips import FloatingIPController -======= from nova import network from nova.tests.api.openstack import fakes import stubout import webob ->>>>>>> MERGE-SOURCE from nova.api.openstack.contrib.floating_ips import \ _translate_floating_ip_view |