From: Sage Weil <sage@inktank.com>
Date: Thu, 14 Mar 2013 17:10:55 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-config'
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e84e6ce08bd4090c9d5e701e7a5224c4d2c52e9;p=ceph-deploy.git

Merge remote-tracking branch 'gh/wip-config'
---

4e84e6ce08bd4090c9d5e701e7a5224c4d2c52e9
diff --cc ceph_deploy/gatherkeys.py
index 2407bfe,9c457e9..0557cb9
--- a/ceph_deploy/gatherkeys.py
+++ b/ceph_deploy/gatherkeys.py
@@@ -3,9 -4,9 +4,8 @@@ import loggin
  
  from cStringIO import StringIO
  
 -from . import exc
  from .cliutil import priority
- 
+ from . import misc
  
  log = logging.getLogger(__name__)