From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Thu, 26 May 2011 20:17:03 +0000 (-0700)
Subject: Merge branch 'wip-obsync'
X-Git-Tag: v0.29~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae5bbc7b08b2eab4d9d8295e65460bde5c3b7196;p=ceph.git

Merge branch 'wip-obsync'
---

ae5bbc7b08b2eab4d9d8295e65460bde5c3b7196