From: Yehuda Sadeh Date: Tue, 6 Nov 2012 23:20:07 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into wip-3206 X-Git-Tag: v0.55~193 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c89d85c77d4067bb4045c3aeabe6659dea3e01bc;p=ceph.git Merge remote-tracking branch 'origin/master' into wip-3206 --- c89d85c77d4067bb4045c3aeabe6659dea3e01bc diff --cc src/common/config_opts.h index 07149bef079,0ef76e5af3c..a691ee4e677 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@@ -449,8 -454,9 +454,10 @@@ OPTION(rgw_gc_max_objs, OPT_INT, 32 OPTION(rgw_gc_obj_min_wait, OPT_INT, 2 * 3600) // wait time before object may be handled by gc OPTION(rgw_gc_processor_max_time, OPT_INT, 3600) // total run time for a single gc processor work OPTION(rgw_gc_processor_period, OPT_INT, 3600) // gc processor cycle time +OPTION(rgw_resolve_cname, OPT_BOOL, false) // should rgw try to resolve hostname as a dns cname record + OPTION(mutex_perf_counter, OPT_BOOL, false) // enable/disable mutex perf counter + // This will be set to true when it is safe to start threads. // Once it is true, it will never change. OPTION(internal_safe_to_start_threads, OPT_BOOL, false)