]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #26444 into master
authorSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 23:26:12 +0000 (17:26 -0600)
committerSage Weil <sage@redhat.com>
Mon, 4 Mar 2019 23:26:12 +0000 (17:26 -0600)
commitbd52f35fd0a895bcfa996cd93c0d4d22aabaf4d7
tree5bcb50371b5a5213a209c192e93416f77f4301da
parente6d6716ea04476e9a13967a996511914e5f327db
parent6c097015bbc1bcfa8abe518680a3d3a17ff39884
Merge PR #26444 into master

* refs/pull/26444/head:
ceph_features: deprecate MON_SINGLE_PAXOS
osdmap: map versions to releases
mon: retire some `osd set/unset` flags

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc