From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Jan 2019 02:37:54 +0000 (-0600)
Subject: Merge PR #25756 into master
X-Git-Tag: v14.1.0~497
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cb4d8a31583bcd76de2828e1fcbde1451b6de0eb;p=ceph.git

Merge PR #25756 into master

* refs/pull/25756/head:
	vstart.sh: force setting dashboard options before first mgr starts
	mon/ConfigMonitor: add --force flag to 'config set'

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

cb4d8a31583bcd76de2828e1fcbde1451b6de0eb