]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-rbd-flatten-cache' into next
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 11 Mar 2013 23:56:35 +0000 (16:56 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 11 Mar 2013 23:57:47 +0000 (16:57 -0700)
Reviewed-by: Sage Weil <sage.weil@inktank.com>

Trivial merge