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

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

7a39e7cbe6b2da2514cb44db70d96c871d66fe93