]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip_choose_acting' into stable
authorSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 07:41:31 +0000 (00:41 -0700)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 20 May 2011 07:41:31 +0000 (00:41 -0700)

Trivial merge