From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 6 Feb 2016 15:43:31 +0000 (+0800)
Subject: Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-tests
X-Git-Tag: v10.0.4~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f854cc1800afad51596e42313a2a8bfd69e5546;p=ceph.git

Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-tests

ceph-disk/test: fix test_prepare.py::TestPrepare tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

7f854cc1800afad51596e42313a2a8bfd69e5546