From: Alfredo Deza <alfredo@deza.pe>
Date: Thu, 24 Sep 2015 14:03:17 +0000 (-0400)
Subject: Merge pull request #360 from ceph/RM-13230
X-Git-Tag: v1.5.29~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cd1e4e03fddef953c67501573030cfedf5aa70d;p=ceph-deploy.git

Merge pull request #360 from ceph/RM-13230

[RM-13230] fix broken unit test, py.test issue
---

8cd1e4e03fddef953c67501573030cfedf5aa70d