From: Matt Benjamin <mbenjamin@redhat.com>
Date: Fri, 14 Dec 2018 17:52:39 +0000 (-0500)
Subject: Merge pull request #23298 from yehudasa/wip-rgw-ps-3
X-Git-Tag: v14.1.0~616
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2e43a4334548fcd133e220227e9bac98f9dadc4a;p=ceph-ci.git

Merge pull request #23298 from yehudasa/wip-rgw-ps-3

rgw: pub-sub
---

2e43a4334548fcd133e220227e9bac98f9dadc4a
diff --cc src/rgw/services/svc_zone.cc
index eeaffc23a18,013a3c2d1cd..ea6518427f5
--- a/src/rgw/services/svc_zone.cc
+++ b/src/rgw/services/svc_zone.cc
@@@ -1027,10 -1040,10 +1033,10 @@@ int RGWSI_Zone::select_bucket_location_
    return 0;
  }
  
- int RGWSI_Zone::select_bucket_placement(RGWUserInfo& user_info, const string& zonegroup_id, const string& placement_rule,
+ int RGWSI_Zone::select_bucket_placement(const RGWUserInfo& user_info, const string& zonegroup_id, const string& placement_rule,
                                        string *pselected_rule_name, RGWZonePlacementInfo *rule_info)
  {
 -  if (!get_zone_params().placement_pools.empty()) {
 +  if (!zone_params->placement_pools.empty()) {
      return select_new_bucket_location(user_info, zonegroup_id, placement_rule,
                                        pselected_rule_name, rule_info);
    }