From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Aug 2014 17:41:36 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-test-ceph-disk'
X-Git-Tag: v0.85~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e9f3759cc696ed9afdf2af3a07443536ef09ad9;p=ceph.git

Merge remote-tracking branch 'gh/wip-test-ceph-disk'
---

0e9f3759cc696ed9afdf2af3a07443536ef09ad9