]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc

Simple merge
Simple merge
Simple merge