From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Mar 2019 03:37:18 +0000 (-0500)
Subject: Merge PR #26898 into nautilus
X-Git-Tag: v14.2.0~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13d7c4f4eced203248c025b9001d23920f500054;p=ceph.git

Merge PR #26898 into nautilus

* refs/pull/26898/head:
	osd/PG: invalidate PG if merging with unexpected version
	osd,mon: include more pg merge metadata in pg_pool_t
	qa/standalone/osd/pg-split-merge.sh: reproduce pg merge problem with empty pgs
	osd: add osd_debug_no_{acting_change,purge_strays}

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

13d7c4f4eced203248c025b9001d23920f500054