]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9be8cdf18d4ce6af3aba35a3381e0071f9d0bb7b
tree647ad8c57228b585c1fe25f29b9ed7b2b422f44dtree | snapshot
parente789f4858105835576278fcbdbbbda300f8f1ccfcommit | diff
parent3e3bd4454f4d03d79b7423fcfbe8466a55412488commit | diff
Merge PR #31584 into master

* 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>
src/common/options.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.