From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Sep 2018 13:21:53 +0000 (-0500)
Subject: Merge PR #23985 into master
X-Git-Tag: v14.0.1~211
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9bf7c810a73c41a23b84ef2a6748e3f6d32a34ea;p=ceph.git

Merge PR #23985 into master

* refs/pull/23985/head:
	ceph-objectstore-tool: add back pool dne check
	qa/suites/rados/singleton/reg11184: remove old test
	ceph-objectstore-tool: import pg at original epoch
	osd: handle null pg slot on startup
	ceph-objectstore-tool: drop support for ancient export files
	osd: avoid dropping osd_lock when pg osdmaps are not laggy
	qa/standalone/osd/pg-merge.sh: add merge vs pg import test

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

9bf7c810a73c41a23b84ef2a6748e3f6d32a34ea