From: Sage Weil <sage@redhat.com>
Date: Tue, 16 Apr 2019 13:28:24 +0000 (-0500)
Subject: Merge PR #27546 into master
X-Git-Tag: v15.1.0~2926
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ee9f787a40a2801f94c8f299b240bc844a7490a;p=ceph.git

Merge PR #27546 into master

* refs/pull/27546/head:
	mgr/progress: fix typo
	mgr/progress: behave if pgs disappear (due to a racing pg merge)

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

9ee9f787a40a2801f94c8f299b240bc844a7490a