]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorJosh Durgin <josh.durgin@inktank.com>
Mon, 11 Mar 2013 23:59:05 +0000 (16:59 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Mon, 11 Mar 2013 23:59:05 +0000 (16:59 -0700)
1  2 
src/librbd/internal.cc
src/osdc/ObjectCacher.cc

Simple merge
Simple merge