Merge remote branch 'cros/upstream' into master

scheduler/monitor_db.py

Index: scheduler/monitor_db.py
diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 7ef0db95c87065950b0a9550226eb5a0113faa54..d0cf46e273b1f544a37a6cdc51ac24d0abffea6a 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -262,7 +262,7 @@ class SchedulerError(Exception):
     """Raised by HostScheduler when an inconsistent state occurs."""
 
 
-class HostScheduler(metahost_scheduler.HostSchedulingUtility):
+class BaseHostScheduler(metahost_scheduler.HostSchedulingUtility):
     """Handles the logic for choosing when to run jobs and on which hosts.
 
     This class makes several queries to the database on each tick, building up
@@ -665,6 +665,15 @@ class HostScheduler(metahost_scheduler.HostSchedulingUtility):
         return []
 
 
+site_host_scheduler = utils.import_site_class(__file__,
+                                  "autotest_lib.scheduler.site_host_scheduler",
+                                  "site_host_scheduler", BaseHostScheduler)
+
+
+class HostScheduler(site_host_scheduler):
+    pass
+
+
 class Dispatcher(object):
     def __init__(self):
         self._agents = []