From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Nov 2010 23:46:54 +0000 (-0800)
Subject: Merge branch 'scrub_no_lock' into unstable
X-Git-Tag: v0.24~210
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d6d05fa4a70474318ac70dd1cadb8d5424e7e4;p=ceph.git

Merge branch 'scrub_no_lock' into unstable
---

c2d6d05fa4a70474318ac70dd1cadb8d5424e7e4