Merge pull request #25003 from ivancich/wip-update-reshard-params

rgw: reshard improvements

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

diff --cc src/common/options.cc
Simple merge

diff --cc src/rgw/rgw_reshard.cc
index 6fd4b4dbe4a84d6dfe79b19c813290b1a99fe57b,4c84d8dff4be34b96200ce4f367c23fa592d4642..955ee536d3c239c7138579ea488c07f96d5e09c9
--- 1/src/rgw/rgw_reshard.cc
--- 2/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@@ -2,9 -2,9 +2,10 @@@
  // vim: ts=8 sw=2 smarttab
  
  #include <limits>
+ #include <sstream>
  
  #include "rgw_rados.h"
 +#include "rgw_zone.h"
  #include "rgw_bucket.h"
  #include "rgw_reshard.h"
  #include "cls/rgw/cls_rgw_client.h"