]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17c59e3 aab43b2)
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)
commit9ee9f787a40a2801f94c8f299b240bc844a7490a
tree754e324230729bf30274064ddd588dfec474d838tree | snapshot
parent17c59e3d8bc8101c2afb6bae37036571d15fd54dcommit | diff
parentaab43b2dab19eb0576b9cb3167dfab6cc91fc646commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.