From: Josh Durgin Date: Thu, 9 Feb 2017 00:18:36 +0000 (-0800) Subject: Merge pull request #13278 from liewegas/wip-luminous X-Git-Tag: v12.0.1~467 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d0792bc00f6e545a6f8e4d9cf222909712466ff4;p=ceph-ci.git Merge pull request #13278 from liewegas/wip-luminous mon,osd: luminous feature bits, require flags, upgrade gates Reviewed-by: Josh Durgin --- d0792bc00f6e545a6f8e4d9cf222909712466ff4 diff --cc src/mon/MonCommands.h index 769dbbc8df3,e1136d1a10e..b128b5f9b8a --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@@ -649,10 -649,10 +649,10 @@@ COMMAND("osd erasure-code-profile ls", "list all erasure code profiles", \ "osd", "r", "cli,rest") COMMAND("osd set " \ - "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds", \ + "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds|require_luminous_osds", \ "set ", "osd", "rw", "cli,rest") COMMAND("osd unset " \ - "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise", \ + "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent", \ "unset ", "osd", "rw", "cli,rest") COMMAND("osd cluster_snap", "take cluster snapshot (disabled)", \ "osd", "r", "")