Merge branch 'wip-9013' into giant

This commit is contained in:
Yehuda Sadeh 2014-10-01 10:28:38 -07:00
commit f26ba0461e

View File

@ -911,7 +911,7 @@ OPTION(rgw_bucket_quota_cache_size, OPT_INT, 10000) // number of entries in buck
OPTION(rgw_expose_bucket, OPT_BOOL, false) // Return the bucket name in the 'Bucket' response header
OPTION(rgw_frontends, OPT_STR, "") // alternative front ends
OPTION(rgw_frontends, OPT_STR, "fastcgi, civetweb port=7480") // rgw front ends
OPTION(rgw_user_quota_bucket_sync_interval, OPT_INT, 180) // time period for accumulating modified buckets before syncing stats
OPTION(rgw_user_quota_sync_interval, OPT_INT, 3600 * 24) // time period for accumulating modified buckets before syncing entire user stats