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

Merge branch 'wip-11470'

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

0ea794c96a55ce8795a9692321a256702e13c33f