From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 09:42:29 +0000 (-0500)
Subject: Merge PR #27021 into master
X-Git-Tag: v15.0.0~141
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be1187575bd16ce61bc356a86bb85c325dfe801c;p=ceph.git

Merge PR #27021 into master

* 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>
---

be1187575bd16ce61bc356a86bb85c325dfe801c
diff --cc .githubmap
index 601854cddc74,601854cddc74..ce99e7ac7ec0
--- a/.githubmap
+++ b/.githubmap
@@@ -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>