From 72bdbc314ac311e8c831410bc4f9c8935bf9d5e8 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Fri, 1 Jul 2011 08:09:19 -0700
Subject: trunk merge

---
 nova/compute/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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."""
-- 
cgit