]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24305 into master
authorSage Weil <sage@redhat.com>
Thu, 11 Oct 2018 12:27:11 +0000 (07:27 -0500)
committerSage Weil <sage@redhat.com>
Thu, 11 Oct 2018 12:27:11 +0000 (07:27 -0500)
* refs/pull/24305/head:
msg/async: ProtocolV1: use continuations instead of direct function calls
msg/async: ProtocolV1 state machine ascii diagram

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
1  2 
src/msg/async/AsyncConnection.cc
src/msg/async/Protocol.cc

Simple merge
Simple merge