]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25755 into master
authorSage Weil <sage@redhat.com>
Fri, 11 Jan 2019 00:12:47 +0000 (18:12 -0600)
committerSage Weil <sage@redhat.com>
Fri, 11 Jan 2019 00:12:47 +0000 (18:12 -0600)
* refs/pull/25755/head:
msg/async/Protocol*: bump global_seq when retrying connection
msg/async/Protocol*: unregister con from accept vs mark_down race

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
1  2 
src/msg/async/ProtocolV1.cc
src/msg/async/ProtocolV2.cc

Simple merge
Simple merge