Merge pull request #19439 from chardan/jfw-wip-14363-normalize-rm

rgw, mon: normalize delete/remove in admin console (cleanup 22444)

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>

diff --cc PendingReleaseNotes
index 631e71c984a4caba4c054c41bd282c959d60bf97,938a15e4d4c5e47e2d0b46b53f7be847ebc4efb5..9f3da71b664b736bda27e0959ee4436c8b5ad604
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -1,20 -1,13 +1,25 @@@
  13.0.1
  ------
  
+ * *RGW, MON*:
+     Commands variously marked as "del", "delete", "remove" etc. should now all be
+     normalized as "rm". Commands already supporting alternatives to "rm" remain
+     backward-compatible.
+ 
  * *CephFS*:
  
 +  * Upgrading an MDS cluster to 12.2.3+ will result in all active MDS
 +    exiting due to feature incompatibilities once an upgraded MDS comes online
 +    (even as standby). Operators may ignore the error messages and continue
 +    upgrading/restarting or follow this upgrade sequence:
 +
 +    Reduce the number of ranks to 1 (`ceph fs set <fs_name> max_mds 1`),
 +    deactivate all other ranks (`ceph mds deactivate <fs_name>:<n>`), shutdown
 +    standbys leaving the one active MDS, upgrade the single active MDS, then
 +    upgrade/start standbys. Finally, restore the previous max_mds.
 +
 +    See also: https://tracker.ceph.com/issues/23172
 +
    * Several "ceph mds" commands have been obsoleted and replaced
      by equivalent "ceph fs" commands:
        - mds dump -> fs dump

diff --cc src/include/util.h
Simple merge

diff --cc src/mon/ConfigKeyService.cc
Simple merge

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/test/cli/radosgw-admin/help.t
Simple merge