]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e789f48 3e3bd44)
Merge PR #31584 into master
authorSage Weil <sage@redhat.com>
Thu, 14 Nov 2019 16:33:24 +0000 (10:33 -0600)
committerSage Weil <sage@redhat.com>
Thu, 14 Nov 2019 16:33:24 +0000 (10:33 -0600)
* refs/pull/31584/head:
common/options: osd_crush_chooseleaf_type is CLUSTER_CREATE
mon/ConfigMonitor: do not assimilate CLUSTER_CREATE options
common/ceph_context: observe container_image so we don't get warnings

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.