1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/531bb0abb05e/ Changeset: 531bb0abb05e User: jmchilton Date: 2014-09-16 19:20:46 Summary: Configure dependency resolvers via config/dependencies_resolvers_conf.xml if available. Has no sample file but bring the configuration file more inline with others. Affected #: 1 file diff -r 80d68ea889c01357b520ecefc56f86b0a44549fc -r 531bb0abb05e0bdae5026feb5cc980ab98a71527 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -137,7 +137,6 @@ self.collect_outputs_from = [ x.strip() for x in kwargs.get( 'collect_outputs_from', 'new_file_path,job_working_directory' ).lower().split(',') ] self.template_path = resolve_path( kwargs.get( "template_path", "templates" ), self.root ) self.template_cache = resolve_path( kwargs.get( "template_cache_path", "database/compiled_templates" ), self.root ) - self.dependency_resolvers_config_file = resolve_path( kwargs.get( 'dependency_resolvers_config_file', 'dependency_resolvers_conf.xml' ), self.root ) self.local_job_queue_workers = int( kwargs.get( "local_job_queue_workers", "5" ) ) self.cluster_job_queue_workers = int( kwargs.get( "cluster_job_queue_workers", "3" ) ) self.job_queue_cleanup_interval = int( kwargs.get("job_queue_cleanup_interval", "5") ) @@ -384,6 +383,7 @@ external_service_type_config_file = [ 'external_service_types_conf.xml', 'config/external_service_types_conf.xml.sample', 'config/external_service_types_conf.xml.sample' ], job_config_file = [ 'job_conf.xml', 'config/job_conf.xml' ], job_metrics_config_file = [ 'job_metrics_conf.xml', 'config/job_metrics_conf.xml' ], + dependency_resolvers_config_file = [ 'dependency_resolvers_conf.xml', 'config/dependency_resolvers_conf.xml' ], job_resource_params_file = [ 'job_resource_params_conf.xml', 'config/job_resource_params_conf.xml' ], migrated_tools_config = [ 'migrated_tools_conf.xml', 'config/migrated_tools_conf.xml' ], object_store_config_file = [ 'object_store_conf.xml', 'config/object_store_conf.xml' ], Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.