]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39039 into master
authorSage Weil <sage@newdream.net>
Fri, 29 Jan 2021 20:01:26 +0000 (14:01 -0600)
committerSage Weil <sage@newdream.net>
Fri, 29 Jan 2021 20:01:26 +0000 (14:01 -0600)
* refs/pull/39039/head:
src/test/cli/monmaptool: adjust for new monmap features
qa/tasks/cephadm: allow custom git_url for cephadm_branch pull
qa/suites/rados/upgrade: include pacific-x
qa/suites/upgrade/pacific-x/parallel
qa/suites: some clean up for quincy
mon: updates for quincy
mon: update for quincy ondisk features
script: add pacific
doc/dev/release-checklist: we tagged v17.0.0
ceph-volume: change to quincy
include/ceph_features: retire MON_SINGLE_PAXOS
include/ceph_features: define FEATURE_SERVER_QUINCY
mon/MgrMonitor: add always_on_modules for quincy
add feature/release name quincy
kickoff v17 quincy
doc/dev/release-checklists: uncheck everything!

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge