Removed duplicate methods created by previous merge.

1 files changed, 1 insertions, 7 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 37b920074..3c89042c8 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1,4 +1,4 @@
-#: tabstop=4 shiftwidth=4 softtabstop=4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -940,12 +940,6 @@ class ComputeManager(manager.SchedulerDependentManager):
         return self.driver.set_host_enabled(host, enabled)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
-    def set_power_state(self, context, instance_id=None, host=None,
-            power_state=None):
-        """Turns the specified host on/off, or reboots the host."""
-        return self.driver.set_power_state(host, power_state)
-
-    @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     def get_diagnostics(self, context, instance_id):
         """Retrieve diagnostics for an instance on this host."""
         instance_ref = self.db.instance_get(context, instance_id)