From: Nathan Cutler <presnypreklad@gmail.com>
Date: Wed, 5 Jul 2017 17:39:54 +0000 (+0200)
Subject: Merge pull request #14646 from gregsfortytwo/wip-17916-kraken
X-Git-Tag: v11.2.1~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11ed483791849905910c879152d1eea41d95604e;p=ceph.git

Merge pull request #14646 from gregsfortytwo/wip-17916-kraken

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

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

11ed483791849905910c879152d1eea41d95604e