]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27546 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 13:28:24 +0000 (08:28 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Apr 2019 13:28:24 +0000 (08:28 -0500)
* 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>

Trivial merge