]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5000b33 f276782)
Merge PR #40146 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 23 Mar 2021 03:03:41 +0000 (20:03 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 23 Mar 2021 03:03:41 +0000 (20:03 -0700)
commit49241859b56fa053403abe3ee9078353e579cbf4
tree6448a60b20b464a1b68ef4e127dbc2462ff98fa8tree | snapshot
parent5000b33180e20e1be05ce49ba6f432eaf517c6f9commit | diff
parentf27678280387bbde86db4a96e176d033965790eacommit | diff
Merge PR #40146 into master

* refs/pull/40146/head:
test: pass peer uuid when adding cephfs mirror peers
mon: check cephfs mirror peer based on remote cluster spec and file system name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mon/FSCommands.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.