From: Alfredo Deza <adeza@redhat.com>
Date: Thu, 26 Feb 2015 16:33:47 +0000 (-0500)
Subject: add the log object to ceph_manager
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96bebc69f9a3a56cb9b3794d1995c3d8d17450c6;p=ceph.git

add the log object to ceph_manager

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f7c1ca4a1e23b03ecf86d5e67d563f95b3a82f99)

Conflicts:
	tasks/ceph_manager.py
	lines shifted but nothing significant changed
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 484c4bcecd6..8256c2220c9 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -6,12 +6,14 @@ import random
 import time
 import gevent
 import json
+import logging
 import threading
 import os
 from teuthology import misc as teuthology
 from tasks.scrub import Scrubber
 from teuthology.orchestra.remote import Remote
-import subprocess
+
+log = logging.getLogger(__name__)
 
 def make_admin_daemon_dir(ctx, remote):
     """