From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 12 Apr 2016 14:32:48 +0000 (-0700)
Subject: Merge branch 'jewel'
X-Git-Tag: v10.1.2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=507e7edbcfc9344568f4a099b4a0c4e79f74afde;p=ceph.git

Merge branch 'jewel'
---

507e7edbcfc9344568f4a099b4a0c4e79f74afde