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

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

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

731d483bcf998119205002ffdcfccb31cf1574f6