summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2021-01-29 21:01:26 +0100
committerSage Weil <sage@newdream.net>2021-01-29 21:01:26 +0100
commit713f79fdf4d76e169aa3b95cd697a0d5dcefdc3f (patch)
tree6f89e5c5a11be7a3c06b0d70142732a2b9f5d591 /CMakeLists.txt
parentMerge pull request #37144 from jmolmo/storage_devices_mgmt (diff)
parentsrc/test/cli/monmaptool: adjust for new monmap features (diff)
downloadceph-713f79fdf4d76e169aa3b95cd697a0d5dcefdc3f.tar.xz
ceph-713f79fdf4d76e169aa3b95cd697a0d5dcefdc3f.zip
Merge PR #39039 into master
* 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>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f167ef6dfaf..c500f31cd7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.2)
# remove cmake/modules/FindPython* once 3.12 is required
project(ceph
- VERSION 16.0.0
+ VERSION 17.0.0
LANGUAGES CXX C ASM)
foreach(policy