]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph
authorJosh Durgin <jdurgin@redhat.com>
Sun, 1 Feb 2015 20:17:34 +0000 (21:17 +0100)
committerJosh Durgin <jdurgin@redhat.com>
Sun, 1 Feb 2015 20:30:57 +0000 (21:30 +0100)
commitb40cb61653d0ce6d0e7cf3a9a046c81080f600af
tree780c55a71cdd51eb0464c903548e273effa8f6f9
parentd0de79842f12f49f4c2e0436cb341e7f3ad48958
parent7c802487601ab2285e183b460cf9cb75d1e1c9a4
Merge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/osdc/ObjectCacher.cc
src/osdc/ObjectCacher.h
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/librbd/internal.cc
src/osdc/ObjectCacher.cc
src/osdc/ObjectCacher.h