Merge "Remove duplicated options in manila/opts.py"

This commit is contained in:
Jenkins 2015-06-27 08:50:55 +00:00 committed by Gerrit Code Review
commit 2e4a34a331

View File

@ -94,12 +94,9 @@ _global_opt_lists = [
manila.quota.quota_opts,
manila.scheduler.driver.scheduler_driver_opts,
manila.scheduler.host_manager.host_manager_opts,
manila.scheduler.host_manager.host_manager_opts,
[manila.scheduler.manager.scheduler_driver_opt],
[manila.scheduler.scheduler_options.scheduler_json_config_location_opt],
manila.scheduler.simple.simple_scheduler_opts,
manila.scheduler.simple.simple_scheduler_opts,
manila.scheduler.weights.capacity.capacity_weight_opts,
manila.scheduler.weights.capacity.capacity_weight_opts,
manila.scheduler.weights.pool.pool_weight_opts,
manila.service.service_opts,