Merge branch 'master' of github.com:coreos-inc/quay

buildman/jobutil/buildreporter.py

@@ -1,5 +1,3 @@
-from trollius import From
-
 from buildman.enums import BuildJobResult
 from util.cloudwatch import get_queue
 

buildman/server.py

@@ -214,7 +214,7 @@ class BuilderServer(object):
     yield From(loop.create_server(transport_factory, host, websocket_port, ssl=ssl))
 
     # Initialize the metrics updater
-    trollius.async(self._queue_metrics_updater())
+    #trollius.async(self._queue_metrics_updater())
 
     # Initialize the work queue checker.
     yield From(self._work_checker())