]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph
authorSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 13:53:22 +0000 (08:53 -0500)
committerSage Weil <sage@redhat.com>
Wed, 3 Feb 2016 13:53:22 +0000 (08:53 -0500)
commite478a4f2a78d949f539fdf5b89134b4284550499
tree9494e3d91bb13918ad647378f3ca8cb15ea45adc
parent9a80477432730632941a005fa24739ff301a4cb6
parent3ba54cc483b70a62ffae3c72b2de6d75fa97bc42
Merge branch 'weighted-priority-queue' of git://github.com/rldleblanc/ceph

Reviewed-by: Samuel Just <sjust@redhat.com>
src/common/Makefile.am
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h
src/test/CMakeLists.txt
src/test/Makefile.am
src/test/common/test_prioritized_queue.cc