]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit82677c38b7547510277c45bcfac15694f723f785
treecb93df9053e62ddcfecb6f21fd0f3a19495183dd
parentf2a877ad0d182f3d2d8fd969abf1faeef40dd9a7
parent1ac8f6abaf084904d0759f187735e284e43b0be8
Merge branch 'next'
src/librbd/internal.cc
src/osdc/ObjectCacher.cc