From: Sage Weil <sage@redhat.com>
Date: Sun, 14 Sep 2014 04:20:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/giant'
X-Git-Tag: v0.86~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f0ca4668ee34cae07c5554d59847f6570d5a661;p=ceph.git

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

3f0ca4668ee34cae07c5554d59847f6570d5a661