Merge pull request #8510 from jmchilton/job_metrics

Fix default job metrics in dev/.
This commit is contained in:
Björn Grüning
2019-08-25 11:07:21 +02:00
committed by GitHub
+1 -1
View File
@@ -842,7 +842,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration):
dependency_resolvers_config_file=[self._in_config_dir('dependency_resolvers_conf.xml')],
error_report_file=[self._in_config_dir('error_report.yml')],
job_config_file=[self._in_config_dir('job_conf.xml')],
job_metrics_config_file=[self._in_config_dir('job_metrics_conf.xml')],
job_metrics_config_file=[self._in_config_dir('job_metrics_conf.xml'), self._in_sample_dir('job_metrics_conf.xml.sample')],
job_resource_params_file=[self._in_config_dir('job_resource_params_conf.xml')],
local_conda_mapping_file=[self._in_config_dir('local_conda_mapping.yml')],
migrated_tools_config=[self._in_config_dir('migrated_tools_conf.xml')],