From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Mar 2019 14:13:34 +0000 (-0600)
Subject: Merge PR #26727 into master
X-Git-Tag: v14.1.1~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0040c9915ddcec795d3047cd63ed72dfc33a4ea4;p=ceph.git

Merge PR #26727 into master

* refs/pull/26727/head:
	qa/standalone/osd/pg-split-merge: fix import_after_merge_and_gap
	osd: add 'send_beacon' tell/asok command(s)

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

0040c9915ddcec795d3047cd63ed72dfc33a4ea4