]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit71260dea5853c12804f292170e17a1306f76f5ff
treea711c12c7471a8442f6fff2ebc6a256b99411c97
parentd8449c70e85e47faea9759e2b33dac0823621714
parent4f05710871db42d83cff79a319de78049aef3dd5
Merge PR #34123 into octopus

* 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>