]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23566 from pdvian/wip-26908-luminous
authorYuri Weinstein <yweinste@redhat.com>
Wed, 12 Sep 2018 21:53:52 +0000 (14:53 -0700)
committerGitHub <noreply@github.com>
Wed, 12 Sep 2018 21:53:52 +0000 (14:53 -0700)
luminous: kv/KeyValueDB: return const char* from MergeOperator::name()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc

Simple merge