From: Sage Weil <sage@newdream.net>
Date: Fri, 6 Aug 2010 18:34:57 +0000 (-0700)
Subject: Merge branch 'snap_cap' into unstable
X-Git-Tag: v0.22~308
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89b0f57733efcf317ac523660898d459d487901d;p=ceph.git

Merge branch 'snap_cap' into unstable
---

89b0f57733efcf317ac523660898d459d487901d