From: Dan Mick <dan.mick@redhat.com>
Date: Sat, 31 Oct 2015 03:00:49 +0000 (-0700)
Subject: Merge pull request #6329 from dzafman/wip-zafman-ceph
X-Git-Tag: v10.0.0~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d567283df3fcad5ae6c59205ec92ca2a7633efb;p=ceph.git

Merge pull request #6329 from dzafman/wip-zafman-ceph

Wip zafman ceph

Reviewed-by: Dan Mick <dmick@redhat.com>
---

2d567283df3fcad5ae6c59205ec92ca2a7633efb