]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #26767 into master
authorSage Weil <sage@redhat.com>
Tue, 5 Mar 2019 17:08:03 +0000 (11:08 -0600)
committerSage Weil <sage@redhat.com>
Tue, 5 Mar 2019 17:08:03 +0000 (11:08 -0600)
commitbf23c64eeb71fec70efb77852f6e572bfddfffd3
tree881ff80d2d30984a18aacbd5d783d665cf44c499
parent11f986830e9e911592a35477a9ce634d6dfe6fe4
parentfd520a17db863057f401d206777a95d3458f498e
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>
src/msg/async/ProtocolV2.cc