]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #27141 into master v15.0.0
authorSage Weil <sage@redhat.com>
Wed, 3 Apr 2019 19:59:03 +0000 (14:59 -0500)
committerSage Weil <sage@redhat.com>
Wed, 3 Apr 2019 19:59:03 +0000 (14:59 -0500)
commit3c9db396aed1f773cbb3441dfb7a21f0b11ab3e1
tree5746ffdf2e885815ec91af999fd6c7c5340bccb5
parent1e7629983f29930b68f6eb26ecabfa59feb60dd4
parent1a689766a50d346bef9f74d45a5086f54f41cca5
Merge PR #27141 into master

* refs/pull/27141/head:
mon/OSDMonitor: fix osd boot feature vs require_osd_release check
include/ceph_features: retire 7 other old features
include/ceph_features: retire ERASURE_CODE_PLUGINS_V2
include/ceph_features: retire OSD_ERASURE_CODES
include/ceph_features: update comment to align with N+2 upgrades
include/ceph_features: adjust whitespace for retired and now usable features
mon: remove check for jewel mons
mds/FSMap: remove support for encoding jewel FSMap
include/ceph_features: enable SERVER_OCTOPUS
test/cli/osdmaptool/feature-set-unset-list: add octopus to output
test/cli/osdmaptool/feature-set-unset-list: change unknown feature bit
qa/releases/octopus.yaml: add octopus upgrade final step
osd/OSDMap: octopus encoding features
mon/OSDMonitor: add mon_debug_no_require_octopus
mon/OSDMonitor: allow 'osd require-osd-release octopus'
mon: add ondisk incompat octopus feature
mon/mon_types: add mon feature for octopus
include/ceph_features: SERVER_O -> SERVER_OCTOPUS

Reviewed-by: Neha Ojha <nojha@redhat.com>
src/common/options.cc
src/mon/MonCommands.h
src/mon/Monitor.cc
src/mon/mon_types.h
src/osd/OSDMap.cc