]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27021 into master
authorSage Weil <sage@redhat.com>
Fri, 22 Mar 2019 09:42:29 +0000 (04:42 -0500)
committerSage Weil <sage@redhat.com>
Fri, 22 Mar 2019 09:42:30 +0000 (04:42 -0500)
* refs/pull/27021/head:
msg: remove XioMessenger
qa/suites/rados/thrash-old-clients: add nautilus
qa/suites/rados/thrash-old-clients: add mimic v1 variant
qa/suites/rados/thrash-old-clients: add mimic
qa/suites/rados/thrash-old-clients: collapse msgr and client choice
qa: remove simplemessenger tests
ceph_test_msgr: remove simple
msg: remove SimpleMessenger

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
.githubmap
CMakeLists.txt
src/CMakeLists.txt
src/common/legacy_config_opts.h
src/common/options.cc
src/msg/Message.cc
src/msg/Message.h
src/test/CMakeLists.txt

diff --cc .githubmap
index 601854cddc74587be9b6a3d0d940198c26bdd669,601854cddc74587be9b6a3d0d940198c26bdd669..ce99e7ac7ec0a4488d6ed27c4dbf607f8958f2f3
@@@ -95,3 -95,3 +95,4 @@@ b-ranto Boris Ranto <branto@redhat.com
  yuvalif Yuval Lifshitz <ylifshit@redhat.com>
  mikechristie Mike Christie <mchristi@redhat.com>
  andrewschoen Andrew Schoen <aschoen@redhat.com>
++mattbenjamin Matt Benjamin <mbenjami@redhat.com>
diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge