]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #42541 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 16 Sep 2021 02:32:31 +0000 (22:32 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 16 Sep 2021 02:32:31 +0000 (22:32 -0400)
* refs/pull/42541/head:
client: switch to use ceph_assert instead of assert
mds: switch to use ceph_assert() instead of assert()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc
src/mds/CDir.cc
src/mds/MDCache.cc
src/mds/MDLog.cc
src/mds/MDSDaemon.cc
src/mds/MDSRank.cc
src/mds/Migrator.cc
src/mds/Server.cc
src/mds/journal.cc

Simple merge
diff --cc src/mds/CDir.cc
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge