]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Wed, 27 Feb 2013 01:29:48 +0000 (17:29 -0800)
committerSage Weil <sage@inktank.com>
Wed, 27 Feb 2013 01:29:48 +0000 (17:29 -0800)
1  2 
src/librbd/internal.cc

Simple merge