diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-03-08 23:27:03 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-03-08 23:27:03 +0000 |
| commit | c4be1b51921b8a81ebc40e1f11d73d409ebebd46 (patch) | |
| tree | cd0cacaf80dd27fd875c3f66e653525eaf4f35a2 | |
| parent | 6207abe3068964c586d06bb0e3740b8bad922dca (diff) | |
| parent | ef86852df6cf75b996eeff85c367132fd8be5e23 (diff) | |
Merging trunk
| -rw-r--r-- | nova/fakerabbit.py | 1 | ||||
| -rw-r--r-- | nova/network/api.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index dd82a9366..a7dee8caf 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -48,7 +48,6 @@ class Exchange(object): nm = self.name LOG.debug(_('(%(nm)s) publish (key: %(routing_key)s)' ' %(message)s') % locals()) - routing_key = routing_key.split('.')[0] if routing_key in self._routes: for f in self._routes[routing_key]: LOG.debug(_('Publishing to route %s'), f) diff --git a/nova/network/api.py b/nova/network/api.py index bf43acb51..4ee1148cb 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -21,6 +21,7 @@ Handles all requests relating to instances (guest vms). """ from nova import db +from nova import exception from nova import flags from nova import log as logging from nova import quota |