]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 221afb0 39e8de2)
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)
commit5dfcb551ff65d0920d4bb1ce6581f2528cbe53e6
treeb9d9f6996e1d052df06f8beb77c7983af4b72ec8tree | snapshot
parent221afb0e283dbef705188ebbf179032d15108b1acommit | diff
parent39e8de2d72e2541323f8ed9d8b68075fcbd02701commit | diff
Merge PR #25755 into master

* 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>
src/msg/async/ProtocolV1.cc diff1 | diff2 | blob | history
src/msg/async/ProtocolV2.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.