From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 10 Aug 2018 02:54:13 +0000 (+0800)
Subject: Merge pull request #23477 from liewegas/wip-kv-merge-name
X-Git-Tag: v14.0.1~629
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c91006141b0ce8fdafe898e712b9791fce29e01b;p=ceph.git

Merge pull request #23477 from liewegas/wip-kv-merge-name

kv/KeyValueDB: return const char* from MergeOperator::name()

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

c91006141b0ce8fdafe898e712b9791fce29e01b