From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Oct 2014 23:44:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/giant'
X-Git-Tag: v0.88~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf4d72a9603f1adffb8c3204bea21b0efe2190db;p=ceph.git

Merge remote-tracking branch 'gh/giant'
---

bf4d72a9603f1adffb8c3204bea21b0efe2190db