]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #26484 into master
authorSage Weil <sage@redhat.com>
Wed, 20 Feb 2019 13:16:12 +0000 (07:16 -0600)
committerSage Weil <sage@redhat.com>
Wed, 20 Feb 2019 13:16:12 +0000 (07:16 -0600)
* refs/pull/26484/head:
msg/async: msgr2: don't smash client cookie on reconnect
doc/msgr2: session establishment failure scenarios
msg/async: msgr2: don't smash peer_name and features on reconnect
msg/async: msgr2: added client and server cookie to protocol

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

Trivial merge