]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0eb0e3 d037c7a)
Merge PR #25915 into master
authorSage Weil <sage@redhat.com>
Tue, 15 Jan 2019 02:49:34 +0000 (20:49 -0600)
committerSage Weil <sage@redhat.com>
Tue, 15 Jan 2019 02:49:34 +0000 (20:49 -0600)
* 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>
1  2 
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.