]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Wed, 9 Jan 2013 23:11:36 +0000 (15:11 -0800)
committerDan Mick <dan.mick@inktank.com>
Wed, 9 Jan 2013 23:11:36 +0000 (15:11 -0800)
Want to get various rbd-related fixes together for upgrade testing

1  2 
src/librbd/internal.cc

Simple merge