From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 21 Feb 2014 21:09:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/wip-7099' into firefly
X-Git-Tag: v0.78~143
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8ebc2a266f410e8376099ed81ff2bdf5ceca0577;p=ceph.git

Merge remote-tracking branch 'origin/wip-7099' into firefly

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

8ebc2a266f410e8376099ed81ff2bdf5ceca0577