]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-journal-aio' into next
authorSage Weil <sage@inktank.com>
Wed, 2 Jan 2013 21:42:22 +0000 (13:42 -0800)
committerSage Weil <sage@inktank.com>
Wed, 2 Jan 2013 21:42:22 +0000 (13:42 -0800)
Reviewed-by: Samuel Just <sam.just@inktank.com>
Backport: bobtail


Trivial merge