summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-07-01 08:09:19 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-07-01 08:09:19 -0700
commit72bdbc314ac311e8c831410bc4f9c8935bf9d5e8 (patch)
treee802568a37b9a6f3350296244ce8b9f118098c0f
parent3cab7a61e130bc66ce96d6ff7e4e54741409b614 (diff)
downloadnova-72bdbc314ac311e8c831410bc4f9c8935bf9d5e8.tar.gz
nova-72bdbc314ac311e8c831410bc4f9c8935bf9d5e8.tar.xz
nova-72bdbc314ac311e8c831410bc4f9c8935bf9d5e8.zip
trunk merge
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 016915d2f..cf42a39aa 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -842,7 +842,7 @@ class ComputeManager(manager.SchedulerDependentManager):
self.inject_network_info(context, instance_id)
self.reset_network(context, instance_id)
- @exception.wrap_exception
+ @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@checks_instance_lock
def pause_instance(self, context, instance_id):
"""Pause an instance on this host."""