From: Samuel Just <sam.just@inktank.com>
Date: Sat, 16 Feb 2013 00:53:40 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/wip-4075'
X-Git-Tag: v0.58~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58837b2b544a0d5a789633d702d5e68e6818d013;p=ceph.git

Merge remote-tracking branch 'upstream/wip-4075'

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

58837b2b544a0d5a789633d702d5e68e6818d013