From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 17 Sep 2014 19:23:17 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/giant'
X-Git-Tag: v0.88~175
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=829981792a64e3a36ef0dd007b9856d99d1dcee6;p=ceph.git

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

829981792a64e3a36ef0dd007b9856d99d1dcee6