From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Jan 2019 00:12:47 +0000 (-0600)
Subject: Merge PR #25755 into master
X-Git-Tag: v14.1.0~434
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dfcb551ff65d0920d4bb1ce6581f2528cbe53e6;p=ceph.git

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

5dfcb551ff65d0920d4bb1ce6581f2528cbe53e6