From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 12 Sep 2018 21:53:52 +0000 (-0700)
Subject: Merge pull request #23566 from pdvian/wip-26908-luminous
X-Git-Tag: v12.2.9~131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6639551a29efa7b84308a14bc97c17df311baf1d;p=ceph.git

Merge pull request #23566 from pdvian/wip-26908-luminous

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

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

6639551a29efa7b84308a14bc97c17df311baf1d