From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 23:33:40 +0000 (-0600)
Subject: Merge PR #31472 into master
X-Git-Tag: v15.1.0~974
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4f32077ae4df52522281cfc5adb9bf9f3ec7e256;p=ceph-ci.git

Merge PR #31472 into master

* refs/pull/31472/head:
	mon/MonMap: encode (more) valid compat monmap when we have v2-only addrs

Reviewed-by: Xiaoxi Chen <superdebuger@gmail.com>
---

4f32077ae4df52522281cfc5adb9bf9f3ec7e256
diff --cc .githubmap
index dc85b6ebff3,dc85b6ebff3..8e63cfe6e85
--- a/.githubmap
+++ b/.githubmap
@@@ -105,3 -105,3 +105,4 @@@ sidharthanup Sidharth Anupkrishnan <san
  varshar16 Varsha Rao <varao@redhat.com>
  guits Guillaume Abrioux <gabrioux@redhat.com>
  mgfritch Michael Fritch <mfritch@suse.com>
++xiaoxichen Xiaoxi Chen <superdebuger@gmail.com>