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

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

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

0aac04a2d08677208772dbbf892cf5f7ec0d7695