From: Joao Eduardo Luis <joao@suse.de>
Date: Thu, 16 Jul 2015 15:07:11 +0000 (+0100)
Subject: Merge branch 'wip-11545'
X-Git-Tag: v9.0.3~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b207d87ebf3d46fbdc0a3bee062c8e3376fa7c3d;p=ceph.git

Merge branch 'wip-11545'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

b207d87ebf3d46fbdc0a3bee062c8e3376fa7c3d