From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Nov 2018 12:50:50 +0000 (-0600)
Subject: Merge PR #24867 into master
X-Git-Tag: v14.1.0~865
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b84730a921df318f484439e247af6f754b230752;p=ceph-ci.git

Merge PR #24867 into master

* refs/pull/24867/head:
	mon: compensate for not having STDLIB_MAP_SPLICING

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
---

b84730a921df318f484439e247af6f754b230752