]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #38033 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 2 Dec 2020 20:08:17 +0000 (12:08 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 2 Dec 2020 20:08:17 +0000 (12:08 -0800)
* refs/pull/38033/head:
client: do not use g_conf().get_val<>() in libcephfs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/client/Client.cc

Simple merge