From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 28 Oct 2014 20:10:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/giant'
X-Git-Tag: v0.88~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=548dfa5f02e2b056047618f4129560454ea60aab;p=ceph.git

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

548dfa5f02e2b056047618f4129560454ea60aab