From: Sage Weil <sage@newdream.net>
Date: Mon, 26 Jun 2017 18:40:16 +0000 (-0500)
Subject: Merge pull request #14997 from ivancich/wip-bring-in-dmclock-p2
X-Git-Tag: v12.1.1~278
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d96491b3acb22586539181a7da353d2afe6c982a;p=ceph-ci.git

Merge pull request #14997 from ivancich/wip-bring-in-dmclock-p2

osd/PG: Add two new mClock implementations of the PG sharded operator queue

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

d96491b3acb22586539181a7da353d2afe6c982a