From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Sep 2015 17:45:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/wip-10617-again'
X-Git-Tag: v9.1.0~149
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a511c245478eff1fea74b4313ef472af8c436f83;p=ceph.git

Merge remote-tracking branch 'gh/wip-10617-again'
---

a511c245478eff1fea74b4313ef472af8c436f83