]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-watch-header-race'
authorSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 20:37:52 +0000 (13:37 -0700)
committerSage Weil <sage@inktank.com>
Thu, 27 Sep 2012 20:37:52 +0000 (13:37 -0700)
1  2 
src/librbd/ImageCtx.cc
src/librbd/internal.cc

Simple merge
Simple merge