From: Sage Weil Date: Wed, 3 Apr 2019 19:59:03 +0000 (-0500) Subject: Merge PR #27141 into master X-Git-Tag: v15.0.0^0 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c9db396aed1f773cbb3441dfb7a21f0b11ab3e1;p=ceph.git 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 --- 3c9db396aed1f773cbb3441dfb7a21f0b11ab3e1