From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 5 Jan 2015 21:28:19 +0000 (-0800)
Subject: Merge pull request #3189 from ceph/wip-10329
X-Git-Tag: v0.92~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ccdce561ec17de1e339bdba6e3bee2da2148843;p=ceph.git

Merge pull request #3189 from ceph/wip-10329

Wip 10329

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

6ccdce561ec17de1e339bdba6e3bee2da2148843