From: Gregory Farnum <greg@gregs42.com>
Date: Thu, 24 Mar 2016 00:09:02 +0000 (-0700)
Subject: Merge pull request #874 from ceph/jewel-15008
X-Git-Tag: v10.2.6~165^2^2~129^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5a1cab66301ce00bceaeb5a50c934bdcc18d526;p=ceph.git

Merge pull request #874 from ceph/jewel-15008

Jewel 15008

Reviewed-by: John Spray <john.spray@redhat.com>
---

f5a1cab66301ce00bceaeb5a50c934bdcc18d526