From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 24 May 2011 19:22:30 +0000 (-0700)
Subject: Merge branch 'wip_ceph_context'
X-Git-Tag: v0.29~42^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cfe372ec28ceddf915575880c43944f31e22edbd;p=ceph.git

Merge branch 'wip_ceph_context'
---

cfe372ec28ceddf915575880c43944f31e22edbd