From: Sage Weil <sage@redhat.com>
Date: Sun, 29 Dec 2019 02:31:33 +0000 (-0600)
Subject: Merge PR #32415 into master
X-Git-Tag: v15.1.0~351
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f2e6d5df6b3a1c7aa4cb6a2fd1b616c08d4ec2f0;p=ceph.git

Merge PR #32415 into master

* refs/pull/32415/head:
	include/cpp-btree: use inline variable to define btree_is_key_compare_to
	include/cpp-btree: use std::conditional_t<>
	include/cpp-btree: use static_assert()
	include/interval_set: use interval_set when appropriate
	include/interval_set: rename some types
	include/cpp-btree: add emplace_hint()

Reviewed-by: Sage Weil <sage@redhat.com>
---

f2e6d5df6b3a1c7aa4cb6a2fd1b616c08d4ec2f0