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

Merge branch 'wip-11786'

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

f735a9905ca2b79cde85723b23a0f4128927d27a