From: Sage Weil <sage@newdream.net>
Date: Fri, 21 Apr 2017 13:37:18 +0000 (-0500)
Subject: Merge pull request #14648 from gregsfortytwo/wip-17916-master
X-Git-Tag: v12.0.3~319
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c1d59c549cc7d34cc808c28344ae62dfc0ccc2a;p=ceph.git

Merge pull request #14648 from gregsfortytwo/wip-17916-master

osd: pglog: with config, don't assert in the presence of stale diverg…

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

4c1d59c549cc7d34cc808c28344ae62dfc0ccc2a