]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8449c7 4f05710)
Merge PR #34123 into octopus
authorSage Weil <sage@redhat.com>
Sat, 28 Mar 2020 00:57:13 +0000 (19:57 -0500)
committerSage Weil <sage@redhat.com>
Sat, 28 Mar 2020 00:57:13 +0000 (19:57 -0500)
* refs/pull/34123/head:
osd/PeeringState: fix pending want_acting vs osd offline race

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.