]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #37313 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 22 Oct 2020 19:55:54 +0000 (12:55 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 22 Oct 2020 19:55:54 +0000 (12:55 -0700)
* refs/pull/37313/head:
cephfs-mirror: restart mirroring on blocklist
cephfs-mirror: public method to fetch peer list
cephfs-mirror: dump rados address in "fs mirror status" asok command
cephfs-mirror: handle blocklist errors during rewatch
cephfs-mirror: periodically drive mirror enable, disable and peer updates
cephfs-mirror: identify a ceph filesystem using (id, name)
cephfs-mirror: introduce Filesystem type
cephfs-mirror: record failed FSMirror instances
cephfs-mirror: protect FSMirror::is_stopping() under lock
cephfs-mirror: unregister asok commands outside lock
cephfs-mirror: spawn peer replayers on peer changes
cephfs-mirror: s/blacklist/blocklist/i
cephfs-mirror: s/dir_name/dir_path/

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/common/options.cc

Simple merge