git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff

author	Sage Weil <sage@redhat.com>
	Wed, 22 Jan 2020 14:23:36 +0000 (08:23 -0600)
committer	Sage Weil <sage@redhat.com>
	Wed, 22 Jan 2020 14:23:36 +0000 (08:23 -0600)

* 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>

		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge