]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #42763 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Sep 2021 00:46:25 +0000 (20:46 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Sep 2021 00:46:25 +0000 (20:46 -0400)
* refs/pull/42763/head:
mon/FSCommands: add 'recover' flag in `fs new` command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/FSMap.cc
src/mds/FSMap.h

Simple merge
diff --cc src/mds/FSMap.h
Simple merge