From 6f167a2e8deff074fbab0659e6c9fb1967da8a34 Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Tue, 25 Jun 2019 00:18:21 -0400 Subject: [PATCH] Run make config-rebuild to update config/docs This is to update galaxy.yml.sample and galaxy_options.rst to be consistent with the latest update to config_schema.yml (#5651edc) (generated with make config-rebuild) --- config/galaxy.yml.sample | 8 +++++++- doc/source/admin/galaxy_options.rst | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/config/galaxy.yml.sample b/config/galaxy.yml.sample index ff5c0b71f46..5b38d4832d6 100644 --- a/config/galaxy.yml.sample +++ b/config/galaxy.yml.sample @@ -172,7 +172,7 @@ galaxy: # Time to sleep between attempts if database_wait is enabled (in # seconds). - #database_wait_sleep: 1 + #database_wait_sleep: 1.0 # Where dataset files are stored. It must accessible at the same path # on any cluster nodes that will run Galaxy jobs, unless using Pulsar. @@ -1534,6 +1534,12 @@ galaxy: # job_config_file option. #job_config: null + # Rather than specifying a dependency_resolvers_config_file, the + # definition of the resolvers to enable can be embedded into Galaxy's + # config with this option. This has no effect if a + # dependency_resolvers_config_file is used. + #dependency_resolvers: null + # When jobs fail due to job runner problems, Galaxy can be configured # to retry these or reroute the jobs to new destinations. Very fine # control of this is available with resubmit declarations in diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst index ce904ed90b8..30f04e85099 100644 --- a/doc/source/admin/galaxy_options.rst +++ b/doc/source/admin/galaxy_options.rst @@ -170,7 +170,7 @@ :Description: Time to sleep between attempts if database_wait is enabled (in seconds). -:Default: ``1`` +:Default: ``1.0`` :Type: float @@ -3197,6 +3197,19 @@ :Type: map +~~~~~~~~~~~~~~~~~~~~~~~~ +``dependency_resolvers`` +~~~~~~~~~~~~~~~~~~~~~~~~ + +:Description: + Rather than specifying a dependency_resolvers_config_file, the + definition of the resolvers to enable can be embedded into + Galaxy's config with this option. This has no effect if a + dependency_resolvers_config_file is used. +:Default: ``None`` +:Type: seq + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``default_job_resubmission_condition`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~