From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 16 Nov 2018 16:03:35 +0000 (-0800)
Subject: Merge pull request #25003 from ivancich/wip-update-reshard-params
X-Git-Tag: v14.1.0~895
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fddd94dc7afd20d328da2edc7eacd08b8338eab;p=ceph.git

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

rgw: reshard improvements

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

7fddd94dc7afd20d328da2edc7eacd08b8338eab
diff --cc src/rgw/rgw_reshard.cc
index 6fd4b4dbe4a8,4c84d8dff4be..955ee536d3c2
--- a/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"