From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 20 May 2011 07:41:31 +0000 (-0700)
Subject: Merge branch 'wip_choose_acting' into stable
X-Git-Tag: v0.28.1~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6995fd515c1ff9418aa78f7fa665e0e0d98a7adf;p=ceph.git

Merge branch 'wip_choose_acting' into stable
---

6995fd515c1ff9418aa78f7fa665e0e0d98a7adf