]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'origin/wip-4087'
authorJosh Durgin <jdurgin@redhat.com>
Sun, 1 Feb 2015 06:36:05 +0000 (07:36 +0100)
committerJosh Durgin <jdurgin@redhat.com>
Sun, 1 Feb 2015 06:36:05 +0000 (07:36 +0100)
commit26ba4315af1bcb89dde012e0bcd8b9e3bf0c23c3
tree3d031815a9a5494a00ae62fb28e2c94492bcd610
parent4cd7448f0c73dddab4fddce9503eda88a43ed9d4
parenta871651857afc11da440a5f5ffcce53bc4b050a3
Merge remote-tracking branch 'origin/wip-4087'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/LibrbdWriteback.cc
src/common/Makefile.am
src/common/config_opts.h
src/librbd/AioRequest.h
src/librbd/LibrbdWriteback.cc
src/librbd/internal.cc
src/test/encoding/types.h