From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 7 Dec 2015 19:54:49 +0000 (-0800)
Subject: Merge branch 'unlinkcallbyrmbucket'
X-Git-Tag: v10.0.2~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a883a48b426aad3d8b6b07768be5c84bf6a8e57;p=ceph.git

Merge branch 'unlinkcallbyrmbucket'

Conflicts:
	src/rgw/rgw_bucket.cc

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

0a883a48b426aad3d8b6b07768be5c84bf6a8e57
diff --cc src/rgw/rgw_bucket.cc
index 5f83ba45cb41a,a3c3b9cb578a7..f4a245f536cbf
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -494,7 -450,7 +494,7 @@@ int rgw_remove_bucket(RGWRados *store, 
      return ret;
    }
  
-   ret = rgw_unlink_bucket(store, info.owner, bucket.tenant, bucket.name);
 -  ret = rgw_unlink_bucket(store, info.owner, bucket.name, false);
++  ret = rgw_unlink_bucket(store, info.owner, bucket.tenant, bucket.name, false);
    if (ret < 0) {
      lderr(store->ctx()) << "ERROR: unable to remove user bucket information" << dendl;
    }