]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ea8c73 4f41800)
Merge PR #26965 into nautilus
authorSage Weil <sage@redhat.com>
Fri, 15 Mar 2019 17:08:34 +0000 (12:08 -0500)
committerSage Weil <sage@redhat.com>
Fri, 15 Mar 2019 17:08:34 +0000 (12:08 -0500)
* refs/pull/26965/head:
ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big
msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state

Reviewed-by: Ricardo Dias <rdias@suse.com>
1  2 
src/common/legacy_config_opts.h patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.