From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Oct 2014 18:19:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/giant'
X-Git-Tag: v0.88~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=191c45be4d064eb1c91ab3afcd54525d07029f95;p=ceph.git

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

191c45be4d064eb1c91ab3afcd54525d07029f95