From: Joao Eduardo Luis <joao@suse.de>
Date: Thu, 16 Jul 2015 17:40:57 +0000 (+0100)
Subject: Merge branch 'wip-10507'
X-Git-Tag: v9.1.0~535
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94d40ca9967c9207a830d335624d79756149683f;p=ceph.git

Merge branch 'wip-10507'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

94d40ca9967c9207a830d335624d79756149683f