]> 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: c4f555f 08fcf01)
Merge PR #32726 into master
authorSage Weil <sage@redhat.com>
Wed, 22 Jan 2020 14:23:36 +0000 (08:23 -0600)
committerSage Weil <sage@redhat.com>
Wed, 22 Jan 2020 14:23:36 +0000 (08:23 -0600)
commite81054c6405116ade52078779001c4fe661e5977
treef69b157465d2fba6d8c760cf6bc70d056cce043ftree | snapshot
parentc4f555fda14a5fa716e5b092b07c18d782e621c8commit | diff
parent08fcf01c040e0caaf5b418d300f774bf8c3033dacommit | diff
Merge PR #32726 into master

* refs/pull/32726/head:
mon/ConfigMonitor: clean out bad config records
mon/ConfigMonitor: make 'config get' on fsid work
common/options: remove NO_MON_UPDATE from mon_dns_srv_name
mon/ConfigMonitor: do not 'config get' on NO_MON_UPDATE options
mon/ConfigMonitor: do not set NO_MON_UPDATE values

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/common/options.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.