From: Sage Weil <sage@redhat.com>
Date: Sat, 4 Oct 2014 00:56:31 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/giant'
X-Git-Tag: v0.88~117
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38dde3d3e2507da660192e638b46d54184a392c7;p=ceph.git

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

38dde3d3e2507da660192e638b46d54184a392c7