summaryrefslogtreecommitdiffstats
path: root/src/rgw/rgw_quota.cc
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@redhat.com>2015-01-19 18:26:00 +0100
committerYehuda Sadeh <yehuda@redhat.com>2015-01-19 18:26:00 +0100
commit6613358ddc5339c8e33c409387fd6044db0b6f26 (patch)
tree12caf6b939f3f57a4aed96659602b95f52ea4990 /src/rgw/rgw_quota.cc
parentMerge remote-tracking branch 'origin/wip-bi-sharding-3' into next (diff)
downloadceph-6613358ddc5339c8e33c409387fd6044db0b6f26.tar.xz
ceph-6613358ddc5339c8e33c409387fd6044db0b6f26.zip
Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next"
This reverts commit f79d8f24e9c0bf0d0b37270eba2745a878f2caed, reversing changes made to 896c8899ac28eb0403bfaa20454f3756f3705c51.
Diffstat (limited to 'src/rgw/rgw_quota.cc')
-rw-r--r--src/rgw/rgw_quota.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_quota.cc b/src/rgw/rgw_quota.cc
index 910da2fffb7..a48ce69890b 100644
--- a/src/rgw/rgw_quota.cc
+++ b/src/rgw/rgw_quota.cc
@@ -318,8 +318,8 @@ int RGWBucketStatsCache::fetch_stats_from_storage(const string& user, rgw_bucket
{
RGWBucketInfo bucket_info;
- string bucket_ver;
- string master_ver;
+ uint64_t bucket_ver;
+ uint64_t master_ver;
map<RGWObjCategory, RGWStorageStats> bucket_stats;
int r = store->get_bucket_stats(bucket, &bucket_ver, &master_ver, bucket_stats, NULL);