From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Sep 2014 21:27:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-9301'
X-Git-Tag: v0.88~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdb1f0f0872941cfae69768acff504b7742734f8;p=ceph.git

Merge remote-tracking branch 'gh/wip-9301'

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

bdb1f0f0872941cfae69768acff504b7742734f8