From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 28 Oct 2014 20:08:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-9806-giant' into giant
X-Git-Tag: v0.87~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d74c8101ca891a1bea49a74e41ac1bea33a0117;p=ceph.git

Merge remote-tracking branch 'origin/wip-9806-giant' into giant

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

5d74c8101ca891a1bea49a74e41ac1bea33a0117