From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Mar 2019 17:08:03 +0000 (-0600)
Subject: Merge PR #26767 into master
X-Git-Tag: v14.1.1~48
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bf23c64eeb71fec70efb77852f6e572bfddfffd3;p=ceph-ci.git

Merge PR #26767 into master

* refs/pull/26767/head:
	Revert "msg/async/Protocol*: send keep alive if existing wins"

Reviewed-by: Sage Weil <sage@redhat.com>
---

bf23c64eeb71fec70efb77852f6e572bfddfffd3