Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

scheduler/metahost_scheduler.py

Index: scheduler/metahost_scheduler.py
diff --git a/scheduler/metahost_scheduler.py b/scheduler/metahost_scheduler.py
index 98f49bed8f9fc8cd8c8e63c3f79bcd955ffe1d9e..9588e9523155396c583140b88df3a6771f35ad70 100644
--- a/scheduler/metahost_scheduler.py
+++ b/scheduler/metahost_scheduler.py
@@ -54,16 +54,16 @@ class MetahostScheduler(object):
 
 
     def schedule_metahost(self, queue_entry, scheduling_utility):
-        """Schedule the given queue entry, if possible.
+         """Schedule the given queue entry, if possible.
 
-        This method should make necessary database changes culminating in
-        assigning a host to the given queue entry in the database.  It may
-        take no action if no host can be assigned currently.
+         This method should make necessary database changes culminating in
+         assigning a host to the given queue entry in the database.  It may
+         take no action if no host can be assigned currently.
 
-        @param queue_entry: a HostQueueEntry DBObject
-        @param scheduling_utility: a HostSchedulingUtility object
-        """
-        raise NotImplementedError
+         @param queue_entry: a HostQueueEntry DBObject
+         @param scheduling_utility: a HostSchedulingUtility object
+         """
+         raise NotImplementedError
 
 
     def recovery_on_startup(self):