From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Sat, 7 May 2011 00:43:10 +0000 (-0700)
Subject: Merge branch 'wip-rados-sync'
X-Git-Tag: v0.28~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=290668c0805ec1cab55671e6feea5d86755758e0;p=ceph.git

Merge branch 'wip-rados-sync'
---

290668c0805ec1cab55671e6feea5d86755758e0