From: Sage Weil <sage@redhat.com>
Date: Tue, 15 Jan 2019 02:49:34 +0000 (-0600)
Subject: Merge PR #25915 into master
X-Git-Tag: v14.1.0~388
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1505a081a8cf207055b2e4bae2cd94fe0275258;p=ceph.git

Merge PR #25915 into master

* refs/pull/25915/head:
	mon/ConfigMonitor: add 'config generate-minimal-conf' command
	common/options: add FLAG_MINIMAL_CONF

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

f1505a081a8cf207055b2e4bae2cd94fe0275258